Add User model stub
Merge branch 'master' of https://github.com/opfo/app
Remove funky lines from travis yml