small vagran modififications
Merged from develop branch
Merged again
Now fixed conflict
Merge branch 'develop' of github.com:pgRouting/pgrouting into develop

Conflicts:
	VERSION