Fixed test controller reference. Fixed grunt test to run once.
Merging with develop branch.
Merge branch 'master' of https://github.com/rhiwri/Boom