Just a commit to keep up with changes
Merge pull request #21 from lilfade/butterflyknife

Finished up lost password changes