Merge pull request #231 from GeeH/master

Scary PR to fix cosmetic changes on live - GOD SPEED
fixed composer to php version 5.4