Fix leftovers from branch merging; remove more php closing tags; bump up requirements...