added .DS_Store to gitignore
Merge branch 'master' of github.com:zanshin/bin
added tmux shell for use by functions