Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
remove validation from password until I get prehooks figured out
Merge pull request #143 from bloodhawk/master

broken pw crap