updated things. not sure what.
Merge branch 'master' of github.com:gibiansky/dotfiles

Conflicts:
	foreign/python/ipython/profile_default/history.sqlite