Setup database
Add travis to readme
Adjust read me (typo)
Merge remote-tracking branch 'origin/master' into feature-pages