new recipes yasnippet-rails.rcp
comment out unactive jabber accounts
change keybindings C-k M-k
disable monday? el-get refresh
add rhtml-mode
rspec-mode config
ido settings and functions
move ido to init-ido
add org-time-clocksum-format
no message on todo keyword change
an interact-with macro and compile functions
Merge branch 'master' of github.com:teaforthecat/emacs.d

Conflicts:
	contrib-functions.el
	init.el
	my-settings.el