Updated bower, test fixes.
Merge branch 'master' of https://github.com/WPFerg/scratch-app