Fix ace-jump-mode face for white backgrounds
C-x ; comments out/uncomments current line
Merge remote-tracking branch 'upstream/master'

Conflicts:
	parts/006-keys.el