update
Merge branch 'master' of github.com:iguto/emacs_dotfiles

Conflicts:
	init.el
Merge branch 'master' of github.com:iguto/emacs_dotfiles

Conflicts:
	init.el
update
Merge branch 'gem_test' of github.com:iguto/emacs_dotfiles

Conflicts:
	Cask
	init.el
Merge branch 'master' of github.com:iguto/emacs_dotfiles

Conflicts:
	init.el