some basic conf changes
added basic email import functionality
Merge branch 'gmail' into evernote