ryan's part merged back to facebook-login

the 'ryan' branch was forked from facebook-login.  I've created the database and populated User, Challenge, and Bet models with test information.