Boh.
Merge branch 'master' of github.com:laynor/smotitah

Conflicts:
	smotitah.el
Do merge changes in smotitah.el