updates for travis
Merge branch 'master' of github.com:zucchi/ZucchiModel
updates for travis