devel: Work in progress

Horrible commit message
Merge remote-tracking branch 'origin/C++-rebuild' into C++-rebuild

Conflicts:
	cli/main.cpp
	include/hop_bits/optimisationProblem.hpp
	src/optimisationProblem.cpp