fix for issue 123
add ipython notebook
Merge branch 'master' of https://github.com/jswhit/basemap

Conflicts:
	Changelog
revert changes to setup.py