Remove emails from urls [MJ-528]
Added display of profile unit description attribute to form [MJ-521/MJ-522]
Made attribute name more descriptive [MJ-521/MJ-522]
Merge pull request #322 from DirectEmployers/module-description

Added display of profile unit description attribute to form [MJ-521/MJ-522]
Add query string to urls originating from email addresses [MJ-528, MJ-535]
PEP 8
Merge branch 'master' into navigation-remove-email-from-url

Conflicts:
	myjobs/urls.py
Log out user when incorrect verify-email is provided [MJ-527]
Decorator redirects to home page rather than throwing 404 [MJ-527]
Merge pull request #324 from DirectEmployers/navigation-remove-email-from-url

Remove email addresses from urls
Merge branch 'master' of github.com:DirectEmployers/MyJobs into tabbed-navigation

Conflicts:
	templates/base.html