update changes
rebuild docs
fix the jsdoc options to grab the correct conf
rebuild docs
Merge branch 'master' into gh-pages