Merge branch 'master' of github.com:stephanb2/gmail-notify

Conflicts:
	README.textile
Merge branch 'master' of github.com:stephanb2/gmail-notify

Conflicts:
	README.textile