Changes to fix C++ compile on OSX
Merge branch 'develop' of github.com:pgRouting/pgrouting into develop

Conflicts:
	VERSION