fix some PSR2 issues, cleanup code
update travis file
Merged back master