sync with develop

Conflicts:
	.gitignore
	package.json

Author: benholloway

package.json

@@ -111,8 +111,8 @@
     "yargs": "latest"
   },
   "devDependencies": {
-    "angularity-helloworld-es5": "angularity/angularity-helloworld-es5#ci-build-0.2.0-A",
-    "angularity-todo-es5": "angularity/angularity-todo-es5#ci-build-0.2.0-C",
+    "angularity-helloworld-es5": "angularity/angularity-helloworld-es5#ci-build-0.2.0-D",
+    "angularity-todo-es5": "angularity/angularity-todo-es5#ci-build-0.2.0-D",
     "autodocs": "^0.6.5",
     "jasmine-diff-matchers": "~2.0.0",
     "jasmine-node": "2.0.0-beta4",