OSX Machine Setup

Sublime Text 3

Setup a command line alias to 'sublime'

alias sublime='"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"'

(Install package control from Sublime tools menu)

Babel ES6 and JSX syntax highlighting https://packagecontrol.io/packages/Babel
EditorConfig - https://github.com/sindresorhus/editorconfig-sublime#readme
SublimeLinter
Sidebar Enhancements - file management... deleting, renaming, moving
Git - handy git integration - log, diff, blame, checkout
GitGutter - show git line changes in gutter

	"font_face": "Consolas",
	"font_size": 12,
	"line_padding_bottom": 1,
	"line_padding_top": 1,
	"highlight_line": true

download git completion https://github.com/git/git/blob/master/contrib/completion/git-completion.bash
rename to make it hidden (add the dot)
update your .bashrc

if [ -f ~/.git-completion.bash ]; then
   source ~/.git-completion.bash
fi

download git prompt https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh
rename to make it hidden (add the dot)
update your .bashrc

if [ -f ~/.git-prompt.sh ]; then
   source ~/.git-prompt.sh
   PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
   export GIT_PS1_SHOWCOLORHINTS=true
fi

I actually prefer to use git aliases rather than bash aliases because they don't break the git autocomplete. https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases

Insert into ~/.gitconfig

[alias]
        c = checkout
        s = status
        po = push origin

install nvm (see https://github.com/creationix/nvm/blob/master/README.markdown)
create or update ~/.bash_profile (source ~/.bashrc)
create or update ~/.bashrc add:

export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm

install beyond compare
from within Beyond Compare.. install command line tools
setup git config to match this: http://www.scootersoftware.com/vbulletin/showthread.php?t=11677