Add some more CS fixes to be PSR-2 compliant - #30

Travis is also updated :)