Sniff PSR-2 as part of travis + fixes + PR 210

run `make` to run `composer install`
run `make test` to run tests.
run `make sniff` to run the code sniffer
run `make sniff test` to run both

Includes @kesar's commit from #210