Misc modifications
Merge branch 'sinatra' of https://github.com/fess89/marketing into sinatra