Fixed development mode not allowing mailers to go out because it was missing a config option
Fixing Specs so that they now pass, which could have caused travis-ci to keep failing
Merge pull request #339 from scouttyg/spec-fixes

Fixing Specs so that they now pass, which could have caused travis-ci to...
Fixing additional xss vulnerabilities and removing User authentication token
Merge pull request #335 from scouttyg/kandan-development-mailer

Fixed development mode not allowing mailers to go out because it was mis...
Merge pull request #340 from scouttyg/more-xss-validation

Fixing additional xss vulnerabilities and removing User authentication t...
Fixed Youtube embed sometimes causing crashing because of faulty Regex
Merge pull request #342 from scouttyg/youtube-embed-fix

Fixed Youtube embed sometimes causing crashing because of faulty Regex
Fixing link embedding sometimes messing up, fixed vimeo embed not matching what Youtube embed does, and fixed image embedding not making sense
Merge pull request #343 from scouttyg/more-embed-fixes

Fixing link embedding sometimes messing up, fixed vimeo embed not matchi...
Added ability to authenticate by authenticity token, needed for compatibility with hubot.

Conflicts:
	app/controllers/application_controller.rb
Complete security overhaul on the application due to possible attack vectors
Merge pull request #346 from alfajango/hubot-authenticity-token

Added ability to authenticate by authenticity token, needed for compatibility with hubot.
Merge pull request #347 from scouttyg/security-overhaul

Complete security overhaul on the application due to possible attack vec...