Update the email shortcut after finding out it's rather a lot more complicated
Merge branch 'dev' into gh-pages
Latest compiled files.