A few minor fixes, added a 'Bug Report' feature to help in the future
Merge branch 'master' into gh-pages

Fixes in master need to be published.