fixes for initial startup on new machine, and building issues
Merge branch 'master' into gh-pages
published, hopefully workin now