styley stuff
Merge branch 'master' of github.com:johnshopkins/communications
merge conflict fixed post-vacation
Building some initial grunt tasks to do compilation for semi-manual deployment