Merge branch 'master' into about-link
Merge pull request #26 from thedod/at-name-fix

Recognize @name's and "@name" as @-names
Merge pull request #27 from thedod/fix-wrong-on-internet

Allow expanding "wrong on internet" twitter links
Add icons to some menu items

Also reshuffle them in a way that hopefully makes more sense
Merge branch 'about-link' into deployment
Merge branch 'master' into deployment
Merge branch 'master' into about-link
Merge branch 'about-link' into deployment