Merge pull request #2 from CarolynJoung/master

top links
Working on getting Cosmo up and working.
Confirmations and Mailer folder buttons
Merge branch 'master' of https://github.com/EricBoersma/jabberbox

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #3 from grant-m-avery/master

Confirmations and Mailer folder buttons
Merge pull request #1 from EricBoersma/master

Getting the changes to you.