Fixing comment

base.html
Merge branch 'master' into erich_dev
Fixing navbar logo height

css/html: Changing the navbar logo height so that it is not touching
the top/bottom/side of the navbar and centering it.
js: Changing the default width of the navbar-slide, removing hard coded
values.
Gender field and bug fixes

models: Expanding the gender field to include M/F, Other, and
unspecified. Appropriate changes in user_registration_form
base.js: Modifying the screen size selection behavior to include
mobile, tablet, and full for use with equal-cols.js. Appropriate
changes to reflect the new size selection.
equal-cols: bug fixes to make sure the columns have the correct size
for the screen width.
Merge branch 'master' into erich_dev
Demographics popover in account settings

Adding the why demographics exploitation in account settings. Will be
added to registration later. Necessary chafes to base.css, base.js,
account_settings.
Changing format of register page.

The register page now follows the two column layout used by account
settings. Also adding the why demographics explanation to it.
equal-cols: Fixing auto height on mobile size.
Merge branch 'erich_dev'