Minor fixes and clean-up
Additional fixes and clean-up
Minor updates
Adding togetherJS
Merge branch 'refs/heads/mockup' into gh-pages