Make plain cmake install to devel when --install not present

Conflicts:
	python/catkin/builder.py
fix up

Conflicts:
	python/catkin/builder.py