Merge branch 'cs/fixes'
Restore original travis build

- Restores original travis build script
  - with modification in that it now should use the .php_cs we include
Merge branch 'cs/travis' into develop

Reverted to old travis config, as script format is working again!