sort out grunt / js import bugs
Merge branch 'master' of github.com:ProjectShepherd/shepherd-web