Merge tag '1.2.0' into develop

Configurable API and Faye endpoints
Added npm-debug.log to .gitignore
Merge branch 'master' into develop
1.2.1
Bumped version to 1.2.1
Merge branch 'release/1.2.1'