merging in upstream
Adding things
Adding grunt deploy task to automatically push the source/etc to github pages
Allowing for JS to concat in development
Merging in upstream