Added map dir and reference to needing php >= 5.4
Fixed conflicts