Merge branch '2.0.X' into 2.1.X

Author: nmccready

bower.json

@@ -3,7 +3,7 @@
   "version": "2.1.4",
   "main": "./dist/angular-google-maps.js",
   "dependencies": {
-    "angular": "1.2 - 1.3",
+    "angular": "1.2 - 1.4",
     "lodash": ">=3.8.0"
   },
   "ignore":[

grunt/options.coffee

@@ -123,7 +123,7 @@ module.exports = (grunt) ->
         updateConfigs: []
         commit: true
         commitMessage: "Release %VERSION%"
-        commitFiles: ['package.json', 'bower.json', 'Gruntfile.coffee', 'dist/*']
+        commitFiles: ['package.json', 'bower.json', 'CHANGELOG.md', 'Gruntfile.coffee', 'dist/*']
         createTag: true
         tagName: "%VERSION%"
         tagMessage: "Version %VERSION%"