Create a default tmux session only when none defined in tmux.conf

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Support $PYTHONUSERBASE per PEP 370

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Changed git merge no fast forward to git smart-merge
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Support $PYTHONUSERBASE per PEP 370
  Create a default tmux session only when none defined in tmux.conf
Added zsh reload alias