Branched to devel4 env
Config changes for devel4
Merge branch 'Devel4'

Conflicts:
	bundle/YouCompleteMe/python/ycm/__init__.pyc
	bundle/YouCompleteMe/python/ycm/base.pyc
	bundle/YouCompleteMe/python/ycm/completers/__init__.pyc
	bundle/YouCompleteMe/python/ycm/completers/all/__init__.pyc
	bundle/YouCompleteMe/python/ycm/completers/all/identifier_completer.pyc
	bundle/YouCompleteMe/python/ycm/completers/all/omni_completer.pyc
	bundle/YouCompleteMe/python/ycm/completers/completer.pyc
	bundle/YouCompleteMe/python/ycm/completers/completer_utils.pyc
	bundle/YouCompleteMe/python/ycm/completers/cpp/__init__.pyc
	bundle/YouCompleteMe/python/ycm/completers/cpp/clang_completer.pyc
	bundle/YouCompleteMe/python/ycm/completers/cpp/flags.pyc
	bundle/YouCompleteMe/python/ycm/completers/general/__init__.pyc
	bundle/YouCompleteMe/python/ycm/completers/general/filename_completer.pyc
	bundle/YouCompleteMe/python/ycm/completers/general/general_completer_store.pyc
	bundle/YouCompleteMe/python/ycm/completers/general/syntax_parse.pyc
	bundle/YouCompleteMe/python/ycm/completers/general/ultisnips_completer.pyc
	bundle/YouCompleteMe/python/ycm/completers/general_completer.pyc
	bundle/YouCompleteMe/python/ycm/completers/threaded_completer.pyc
	bundle/YouCompleteMe/python/ycm/extra_conf_store.pyc
	bundle/YouCompleteMe/python/ycm/utils.pyc
	bundle/YouCompleteMe/python/ycm/vimsupport.pyc
	bundle/YouCompleteMe/python/ycm/youcompleteme.pyc
	bundle/YouCompleteMe/python/ycm_core.so
Merge!
Merge branch 'Devel4'