Merge branch 'home' into 'fixthatshit'

# Conflicts:
#   powerline-shell-init
#   zshrc

zshrc

@@ -1,7 +1,7 @@
 echo "Loading zgen..."
 source ~/bin/zgen/zgen.zsh
-
 source ~/bin/fixcolors
+
 HIST_STAMPS="yyyy-mm-dd"
 HISTFILE=~/.histfile
 HISTSIZE=2000
@@ -25,7 +25,7 @@ bindkey -e
 export LESS="-X -R -F"
 alias http='python -m http.server'
 export PATH=$HOME/bin:/usr/local/bin:$PATH
-alias t=todo.sh
+
 export EDITOR=mg
 
 autoload insert-composed-char
@@ -74,4 +74,4 @@ unalias cp
 setopt NO_SHARE_HISTORY
 setopt HIST_EXPIRE_DUPS_FIRST
 
-yellow All Done!
+yellow All Done!