added .travis.yml; updated Makefile
Merge branch 'develop'
Merge branch 'master' of github.com:prawn-cake/simple-models