Merge pull request #95 from stormpath/develop

Add in latest changes.
Merge branch 'develop'

* develop:
  Installing mock for all tests (since it's required even in 2.x).
  Removing unnecessary whitespace.
  Removing unnecessary whitespace.
  Removing unnecessary whitespace.
  Removing unnecessary whitespace.
  Version bump in preparation for release.
  Updating changelog in preparation for new release.
  Removing trailing line.
  Removing unnecessary comments from setup.
  make password reset flows consistent