Fix issue #253 (Github links should use https)
Merge fixes for issues #90 and #253
Merge fix for issue #253 into heroku