- rebased changes on top of jeremyckahn/shifty/master
- bumped version to 1.2.0
- added myself to the authors lists