ikhal: refactoring

also fixed some bugs/glitches
Merge branch 'master' of github.com:geier/khal

Conflicts:
	TODO.rst