update from work notebook
Merge branch 'master' of https://github.com/zerosign/dotfiles

Conflicts:
	emacs/my-ruby-mode.el