Update api_conventions.asciidoc
switched to tilde notiation for relative package versions
updated angular build to add $invoke to the config (rather than  and ) so that other components can define their dependencies in the component.
Updating API and log generator
updated link to jenkins
Update api_methods.asciidoc

Fix a minor typo in the docs: upcomming -> upcoming
Merge pull request #92 from victorquinn/patch-1

Fix minor typo in the docs: upcomming: upcoming
Merge branch 'master' of github.com:elasticsearch/elasticsearch-js into 2.1
Fixed a link to the deprecated indices-status method
Update quick_start.asciidoc

Since the `from` property is doing this `from: (pageNum - 1) * perPage,` logic, I think the default for `pageNum` should be `1`. Otherwise it would results it `-15` when `pageNum` and `perPage` are defaults.
Merge pull request #99 from doowb/patch-1

Update quick_start.asciidoc
moved browser-builds section to their own page/file and modified verbiage about IE9
fixed asciidoc id
push browser_buils to their own page
added a link directly to the browser_builds page
Merge remote-tracking branch 'upstream/master' into 2.1

Conflicts:
	docs/api_methods_1_x.asciidoc
	docs/browser_builds.asciidoc
Merge pull request #105 from spenceralger/2.1

update 2.1 with changes from master
version 2.1.5
forgot to exclude _elasticsearch directories from npm
version 2.1.6