Added macrostep.
Merge branch 'master' of github.com:r0man/.emacs.d

Conflicts:
	init.el