Add global .gitignore and update .tmux.conf
Merge remote-tracking branch 'origin/master'