Merge pull request #1 from espenfjo/master

pull from upstream
Import all external javascripts to reduce number of external deps
Merge pull request #3 from ccsalvesen/master

Import all external javascripts to reduce number of external deps