tmux update
Merge branch 'master' of github.com:greeneca/initial_setup
Merge branch 'master' of github.com:greeneca/initial_setup
fix aliases
Merge branch 'master' of github.com:greeneca/initial_setup