Tidy up files, seperate out js
Merge branch 'master' into gh-pages
Adjust starting pos
Merge branch 'master' into gh-pages