Added OTR and notification info to --version
Removed empty lines
Merge branch 'master' into gmail