stage changes for merge with master
add additional email functionality, add keystoke favicon and logo
Merge pull request #1 from aacase/merge1

Merge1