added .swp files to .gitignore
Added tmux
Merge branch 'merge_me'