sync with develop

Conflicts:
	.gitignore
	package.json

Author: benholloway

.gitignore

@@ -1,4 +1,5 @@
 /.idea
 /node_modules
 /test/*temp
-npm-debug.log
+/npm-debug.log
+/documentation

.travis.yml

@@ -19,3 +19,13 @@ script:
   - node node_modules/jasmine-node/bin/jasmine-node --version # expect jasmine 2.x
   - npm run lint
   - npm test
+
+after_success:
+  - npm run autodocs
+env:
+  global:
+  - secure: U+IdWhk/tUsG9e7hOxxeGhzbJ3iYYtvRyz4zExVI6JJz22TJX5UXwJJQmrrNcM1bwt1GTAbX3xYavE+kqs9I5wyeMX92+/o1gz2vp/46wRXAKC/X8lULVH0vopVtnKZnyKUIzQTYd7NxX0JsweJ9Y/4szkskygnTDu6lXkpPPVk=
+  # - DOCUMENT_BRANCH: ${TRAVIS_BRANCH}
+  - FLAG_PUBLISH_ON_RELEASE: 'true'
+  - REPO_SLUG: 'angularity/angularity.github.io'
+  - GH_PUBLISH_BRANCH: 'master'

package.json

@@ -16,7 +16,9 @@
   ],
   "scripts": {
     "test": "node node_modules/jasmine-node/bin/jasmine-node --verbose --captureExceptions test/specs",
-    "lint": "node test/jshint.js"
+    "lint": "node test/jshint.js",
+    "generatedocs": "mkdir -p documentation && echo 'autodocs placeholder documentation' > documentation/index.html && ls -la documentation && echo 'Placeholder documentation generated'",
+    "autodocs": "node ./node_modules/autodocs"
   },
   "contributors": [
     "bholloway",
@@ -109,12 +111,13 @@
     "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",
+    "autodocs": "^0.6.5",
     "jasmine-diff-matchers": "~2.0.0",
     "jasmine-node": "2.0.0-beta4",
     "jshint-stylish": "^1.0.1",
     "ncp": "~2.0.0",
-    "ps-tree": "~0.0.3",
-    "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"
+    "ps-tree": "~0.0.3"
   }
 }