Fix a few misc. bugs
Merge branch 'master' into gh-pages
grunt