Updated CMakeLists

They now enable bstring to be installed under (by default) /usr/local.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt