Few tweaks & heroku ready
Move tweaks & travis ready