fixing urban def num bug and the exception handling
Merge branch 'master' of https://github.com/adrianc-a/whatis
better error handling
Merge remote-tracking branch 'upstream/master'

Conflicts:
	whatis.py