Error and warning meassages standardised
Changed the help text for the -n option
Merge branch 'master' of github.com:mtop/geocoder

Conflicts:
	geocoder.py