Merge pull request #118 from spring-peepers-2014/restructure-models

Enable bycrypt