Source cleanup
Merge branch 'vns-pcp-ng' of https://github.com/flowlo/pcp-vns into vns-pcp-ng

Conflicts:
	include/main.hpp

Stupid include juggling.
Fix include for onestepCD