Merge remote-tracking branch 'origin/3.0' into develop

Conflicts:
	.gitignore
	.gitmodules
	.vim/bundle/VimDebugger
	.vim/bundle/ack
	.vim/bundle/checksyntax
	.vim/bundle/command-t
	.vim/bundle/fugitive
	.vim/bundle/nerdcommenter
	.vim/bundle/piv
	.vim/bundle/pydoc.vim
	.vim/bundle/rbtweaks/plugin/sessionman.vim
	.vim/bundle/snipmate
	.vim/bundle/snipmate-snippets/snippets
	.vim/bundle/supertab
	.vim/bundle/vim-colors-solarized
	.vimrc
	README.markdown
	bootstrap.sh