dont remember this change
Merge branch 'master' of github.com:chemlab/chemlab

Conflicts:
	chemlab/ipython.py