Merge pull request #173 from tmcgee/master

fixes #155
Updated grunt tasks, readme, proxys, and tagged commit as v1.2.0.