Handle travis-ci updating their version of PHPUnit to 4.1
Install phpunit except when running phpcs
Merge branch 'master' of github.com:FriendsOfCake/travis into develop