emacs: merge at office
git: add `.emacs.d/.mc-lists.el' to the list of ignored files.
Merge branch 'master' of https://github.com/Shinnya/dotfiles
Merge branch 'master' of https://github.com/Shinnya/dotfiles
merge
Merge branch 'master' of https://github.com/Shinnya/dotfiles
Merge branch 'master' of https://github.com/Shinnya/dotfiles
Merge branch 'master' of https://github.com/Shinnya/dotfiles
Merge branch 'master' of https://github.com/Shinnya/dotfiles
Merge branch 'master' of https://github.com/Shinnya/dotfiles
Merge branch 'master' of https://github.com/Shinnya/dotfiles
vim: add cake.vim settings and load an environment specific vim file on startup.
Merge branch 'master' of https://github.com/Shinnya/dotfiles

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/Shinnya/dotfiles

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/Shinnya/dotfiles
Merge branch 'master' of https://github.com/Shinnya/dotfiles
vim: add vim-prettyprint
vim: set nowrap and set virtualedit=all
vim: add new keymaps for moving a cursor.
vim: change keymaps for moving windows.