Updated bower.json to resolve merge conflict

Due to the fact that @brenoc merged a pull request that contained changes to bower.json a merge conflict was created with this pull request.