Merge pull request #4 from pasharayan/master

styling + testing
tweak new discussion email
Notifications feature + some controller refractoring
comment and first-name last name
fixed users/edit page
send emails for new comments, add new discussion button
user mailer change sending name
passing more variables into new comment email
edit and delete discussion
add link + minor modifications
add attr_accessible
add edit / delete functionality to groups
test
Merge remote-tracking branch 'upstream/master'
fixed email URLs
changed emails to haml
fixed haml email formatting
2nd fix haml urls
add link model, controller and views
test