Updated linux emacs settings
Updated unittest.el
Updated whitespace maximum column number
Merge branch 'master' into windows

Conflicts:
	dotemacs-custom.el