Merge pull request #40 from rdegges/develop

Release 1.1.0
Merge pull request #41 from stormpath/development

Release 1.1.0
Merge remote-tracking branch 'upstream/master'

* upstream/master: