Update travis testing
Update for style fixes
Merge pull request #117 from rackerlabs/cleanup

Style Cleanup