Removed drafts
Merge branch 'master' of github.com:revans/dotfiles

Conflicts:
	offlineimaprc
Merging master in and adding more updates
Merged