Bug via unused code. Removed code. Happiness all around. Big thanks to @goliatone for identifying
Merge branch 'master' into gh-pages