Small changes
Merge branch 'master' of github.com:vwood/.emacs.d

Conflicts:
	init.el
Improve comint window size fix