Merge pull request #65 from eile/master

Improvements based on James D. review
Update generated files
Update Travis config
Update Travis config
Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Update Travis config