diff --git a/gitconfig b/gitconfig
index f12500c..bd80481 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,7 +7,7 @@
 [core]
 	editor = /usr/bin/vim
 [push]
-	default = tracking
+	default = upstream
 [github]
 	user = mikecampo
 [diff]
diff --git a/zsh/aliases b/zsh/aliases
index 6b5fa28..f29f03b 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -35,6 +35,7 @@ alias dr='cd ~/Dropbox'
 alias duh='du -csh'
 alias functions='vim ~/.dotfiles/zsh/functions'
 alias f='fg'
+alias for='foreman start -p 9292'
 alias history='fc -l 1'
 alias h='heroku'
 alias irb='irb --readline -r irb/completion'
@@ -120,6 +121,7 @@ alias notes='cd ~/Dropbox/notes'
 alias daily='cd ~/Dropbox/notes/daily'
 alias guide='vim ~/Dropbox/notes/daily/DAILY_GUIDE'
 alias pn='vim ~/Dropbox/notes/project-notes'
+alias bucket='cd ~/Dropbox/notes/buckets'
 
 # Projects
 alias projects='cd ~/code/projects'