cleanup
Reverted .gitignore
Merge branch 'master' of github.com:pgRouting/osm2pgrouting

Conflicts:
	.gitignore