Merge pull request #1 from lilfade/butterflyknife-dev

forgot password stuff
Merge pull request #2 from lilfade/butterflyknife-dev

fixed errors on my part from dev env
Merge pull request #3 from lilfade/butterflyknife-dev

remove random .xml files
Fixed a few things
Merge branch 'pr/53' into butterflyknife
Merge pull request #4 from alexweissman/butterflyknife

Butterflyknife
Merge pull request #5 from lilfade/butterflyknife

Butterflyknife