moving js includes around
Merge branch 'master' of github.com:jmervine/mervine.net