Merge branch 'release/1.1.0'
Merge branch 'release/1.2.0'
Fixes #87. Bumped version numbers, and added a horrendous fix for missing context path in Javascript. We should probably refactor this, but it's Friday, so we're thinking about Beer and TV. SHIP IT
Merge branch 'hotfix/1.2.1' into develop