tmp commit
Merge branch 'master' of https://github.com/frid/vim-config2

Conflicts:
	bundle/YouCompleteMe/python/ycm/__init__.pyc
	bundle/YouCompleteMe/python/ycm/client/__init__.pyc
	bundle/YouCompleteMe/python/ycm/client/base_request.pyc
	bundle/YouCompleteMe/python/ycm/client/command_request.pyc
	bundle/YouCompleteMe/python/ycm/client/completion_request.pyc
	bundle/YouCompleteMe/python/ycm/client/event_notification.pyc
	bundle/YouCompleteMe/python/ycm/client/omni_completion_request.pyc
	bundle/YouCompleteMe/python/ycm/client/ycmd_keepalive.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_helpers.pyc
	bundle/YouCompleteMe/python/ycm/completers/cpp/flags.pyc
	bundle/YouCompleteMe/python/ycm/completers/general/__init__.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/diagnostic_interface.pyc
	bundle/YouCompleteMe/python/ycm/extra_conf_store.pyc
	bundle/YouCompleteMe/python/ycm/server/__init__.pyc
	bundle/YouCompleteMe/python/ycm/server/handlers.pyc
	bundle/YouCompleteMe/python/ycm/server/responses.pyc
	bundle/YouCompleteMe/python/ycm/server/server_state.pyc
	bundle/YouCompleteMe/python/ycm/server/server_utils.pyc
	bundle/YouCompleteMe/python/ycm/server/watchdog_plugin.pyc
	bundle/YouCompleteMe/python/ycm/user_options_store.pyc
	bundle/YouCompleteMe/python/ycm/utils.pyc
	bundle/YouCompleteMe/python/ycm/vimsupport.pyc
	bundle/YouCompleteMe/python/ycm/youcompleteme.pyc
	bundle/YouCompleteMe/third_party/argparse/argparse.pyc
	bundle/YouCompleteMe/third_party/bottle/bottle.pyc
	bundle/YouCompleteMe/third_party/frozendict/frozendict/__init__.pyc
	bundle/YouCompleteMe/third_party/pythonfutures/concurrent/__init__.pyc
	bundle/YouCompleteMe/third_party/pythonfutures/concurrent/futures/_base.pyc
	bundle/YouCompleteMe/third_party/requests-futures/requests_futures/__init__.pyc
	bundle/YouCompleteMe/third_party/requests/requests/auth.pyc
	bundle/YouCompleteMe/third_party/requests/requests/cookies.pyc
	bundle/YouCompleteMe/third_party/requests/requests/exceptions.pyc
	bundle/YouCompleteMe/third_party/requests/requests/hooks.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/__init__.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/__init__.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/big5prober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/chardistribution.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/charsetgroupprober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/charsetprober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/codingstatemachine.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/compat.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/constants.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/cp949prober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/escprober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/euckrprober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/euctwprober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/gb2312prober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/hebrewprober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/latin1prober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/mbcharsetprober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/chardet/utf8prober.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/_collections.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/connection.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/contrib/__init__.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/exceptions.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/filepost.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/packages/__init__.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/packages/ordered_dict.pyc
	bundle/YouCompleteMe/third_party/requests/requests/packages/urllib3/packages/six.pyc
	bundle/YouCompleteMe/third_party/requests/requests/structures.pyc
	bundle/YouCompleteMe/third_party/waitress/waitress/buffers.pyc
	bundle/YouCompleteMe/third_party/waitress/waitress/compat.pyc
	bundle/YouCompleteMe/third_party/waitress/waitress/receiver.pyc
	bundle/YouCompleteMe/third_party/waitress/waitress/server.pyc
	bundle/YouCompleteMe/third_party/waitress/waitress/trigger.pyc
	bundle/YouCompleteMe/third_party/waitress/waitress/utilities.pyc
	bundle/YouCompleteMe2/python/ycm/base.pyc
	bundle/YouCompleteMe2/python/ycm/completers/cpp/clang_completer.pyc
	bundle/YouCompleteMe2/python/ycm/completers/general/filename_completer.pyc
	bundle/YouCompleteMe2/python/ycm/unsafe_thread_pool_executor.pyc
	bundle/YouCompleteMe2/third_party/pythonfutures/concurrent/futures/__init__.pyc
	bundle/YouCompleteMe2/third_party/pythonfutures/concurrent/futures/process.pyc
	bundle/YouCompleteMe2/third_party/pythonfutures/concurrent/futures/thread.pyc
	bundle/YouCompleteMe2/third_party/requests-futures/requests_futures/sessions.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/__init__.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/adapters.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/api.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/certs.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/compat.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/models.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/big5freq.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/escsm.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/eucjpprober.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/euckrfreq.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/euctwfreq.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/gb2312freq.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/jisfreq.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/jpcntx.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/langbulgarianmodel.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/langcyrillicmodel.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/langgreekmodel.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/langhebrewmodel.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/langhungarianmodel.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/langthaimodel.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/mbcsgroupprober.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/mbcssm.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/sbcharsetprober.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/sbcsgroupprober.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/sjisprober.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/chardet/universaldetector.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/__init__.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/connectionpool.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/contrib/pyopenssl.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/fields.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/poolmanager.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/request.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/response.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/packages/urllib3/util.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/sessions.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/status_codes.pyc
	bundle/YouCompleteMe2/third_party/requests/requests/utils.pyc
	bundle/YouCompleteMe2/third_party/retries/retries.pyc
	bundle/YouCompleteMe2/third_party/waitress/waitress/__init__.pyc
	bundle/YouCompleteMe2/third_party/waitress/waitress/adjustments.pyc
	bundle/YouCompleteMe2/third_party/waitress/waitress/channel.pyc
	bundle/YouCompleteMe2/third_party/waitress/waitress/parser.pyc
	bundle/YouCompleteMe2/third_party/waitress/waitress/task.pyc
	vimrc
rename YCM
Merge branch 'master' of https://github.com/frid/vim-config2
remove YCM Folder
add submodule jedi
add YCM