Replaced all instances of email with display_name
Merge branch 'master' of github.com:bearded-nemesis/bearded-nemesis
Fixed Nathan's attempt to compare a Fixnum to a nil.  What a jerk.