Add sitelink shortcut
Add heroku to the path
Various tweaks and fixes