Fix name
Merge branch 'master' of github.com:naspeh/namail

Conflicts:
	README.rst