I fixed the user registration page so the user who is logged in as twitter
or any other service such as github or facebook with not through an error
when they try to update thier profile
Merge branch 'master' of github.com:trosborn/NewYears
trying to figure out a bug with why the tests are not working
not sure I think its differences between our computers it
points to javascript and development logs when I push to github

Conflicts:
	log/development.log
Merge branch 'master' of github.com:trosborn/NewYears