2014-12-28 snap
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vim/bundle/.neobundle/doc/neobundle.txt
	.vim/bundle/.neobundle/doc/neocomplcache.txt
	.vim/bundle/.neobundle/doc/tags
	.vim/bundle/.neobundle/doc/unite.txt
	.vim/bundle/neobundle.vim
	.vim/bundle/neocomplcache
	.vim/bundle/unite.vim
	.vim/bundle/vim-railscasts-theme