Installed conqueshell plugin
Merge branch 'master' into python-plugins
Merge branch 'master' into python-plugins
Added conqueshell configuration
Merge branch 'master' into python-plugins

Conflicts:
	vimrc
Added conqueterm helper functions for faster REPL using conqueterm
Fixed conque shell bundle name
Improved conqueshell addon for REPL programs
Put conque-repl as a separate plugin
Merge branch 'master' into python-plugins

Conflicts:
	vimrc
Merge branch 'master' into python-plugins
Merge branch 'master' into python-plugins
Merge branch 'master' into python-plugins
Merge branch 'master' into python-plugins

Conflicts:
	vimrc
Merge branch 'master' into python-plugins
Merge branch 'master' into python-plugins
Merge branch 'master' into python-plugins
Merge branch 'master' into python-plugins
Updated zsh indent
Disable relative line numbers