Bumped version to 1.2.0 and merged 1.1.1
Merge pull request #624 from rustyswayne/1.2.0

Merge 1.1.1
Merge pull request #625 from rustyswayne/1.1.1

Prep for 1.2.0
Merge remote-tracking branch 'merchello/1.2.0' into 1.1.1