Merge remote-tracking branch 'markrickert/master'

Conflicts:
	aliases/available/git.aliases.bash

diff --cc aliases/available/git.aliases.bash
index 40919f3,9a9a106..ab86853
--- 1/aliases/available/git.aliases.bash
--- 2/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@@ -11,7 -11,7 +11,8 @@@ alias gst='git status
  alias gs='git status'
  alias gss='git status -s'
  alias gl='git pull'
 +alias gpr='git pull --rebase'
+ alias gpp='git pull && git push'
  alias gup='git fetch && git rebase'
  alias gp='git push'
  alias gpo='git push origin'