wip
Merge branch 'master' of https://github.com/mythagel/cxxide.git

Conflicts:
	cmake_editor/cmake_editor.cpp
minor