General clean-up and remove roll-up code
Fix bugs
Remove yucky hard-coding
Merge branch 'master' into gh-pages

* master:
  Remove yucky hard-coding
  Fix bugs
  General clean-up and remove roll-up code