Fixed all the pull request comments and cleaned up
Merging madness
travisplexer: pr-454-linux travis ci test