Merge pull request #57 from jfarbowitz/master

These are just a few formatting and text tweaks
Merge remote-tracking branch 'upstream/master'
adding user profile features

Adding mailing_list, karma points, a landing page for
user accounts (to be filled later with edit forms)
and made email required.
Merge pull request #61 from steventlamb/feature/user_profiles

adding user profile features
Merge pull request #60 from jfarbowitz/master

I updated my bio
Adding templates to conveniently drop in analytics.
Merge pull request #62 from steventlamb/feature/analytics

Adding templates to conveniently drop in analytics.
Updating Steve and Ali's bios with new content.
issue54 | help text on notes field
issue47 | fixing links on homepage
issue55 | don't show empty website
issue51 | featured vendor link more prominent
issue31 | adding short version privacy policy in modal window
Merge pull request #63 from steventlamb/feature/add_privacy_policy

issue31 | adding short version privacy policy in modal window
quickfix - too much helptext is not always good.
Merge remote-tracking branch 'upstream/master'