Add Links
Fix twitter link.
Add email address
Merge remote-tracking branch 'mike/master'

* mike/master:
  Add email address
  Fix twitter link.
  Add Links

Conflicts:
	assets/js/views/about.js