Added a fancy prompt; several refactorings
Merge branch 'master' of github.com:gorauskas/dotfiles

* 'master' of github.com:gorauskas/dotfiles:
  added alias for ipython

Conflicts:
	.bash_alias