Handle creating users through twitter
Merge branch 'master' into location_two