Clean up whitespace and style that was not needed
Merge branch 'master' of github.com:aaronlifshin/whysaurus.  Fix in bug of delete, and small change to meta text.

Conflicts:
	templates/django/notificationEmail.html