(New) Highlight ifdefs and use [f6] to comment/uncomment current line
Merge branch 'master' of https://github.com/vspetrov/cfg

Conflicts:
	emacs/emacs_cfg