Fix so test runner is working so we can use grunt
Merge branch 'master' of github.com:hobocode/hellberg
more fixes for resource deployment