fix warnings....
fix more warnings....
fix more warnings....
fix last warnings....
Update .travis.yml
Merge pull request #272 from ucsd-progsys/refactoring

Refactoring