Apply "skinny upgrade"
Fix tests
Add Travis settings
Refactor
Merge pull request #1 from seratch/sera-feedback

feedback