Updated grunt tasks, readme, proxys, and tagged commit as v1.2.0.
Merge remote-tracking branch 'upstream/master'