Tidying up travis.yml and re-enabling phpcs