Specify cowboy mode in Gruntfile deploy task
Merge branch 'master' of github.com:aerobatic/starter-template
bower and packages.json updates