Merge pull request #611 from rustyswayne/1.1.0

1.1.0 Released
Merge remote-tracking branch 'merchello/1.1.0'
Merge remote-tracking branch 'merchello/master'
Merge pull request #616 from rustyswayne/master

Cleanup