more bookmarks
disable evil mode in certain modes
bind C-c C-y to paste in term mode
make font smaller
Merge branch 'master' into windows

Conflicts:
	config/init-term.el
	init.el