Style cleanup
Style and test cleanup
Merge pull request #116 from rackerlabs/cleanup

Test and Style Cleanup
Update travis testing
Update for style fixes
Merge pull request #117 from rackerlabs/cleanup

Style Cleanup