Remove the git-extras submodule
Add git extras as submodule; update PATH to new location
Merge branch 'feature/move_git_extras' into develop

Conflicts:
	scripts/git-extras
Update to vim settings; reorganized into module files; updated line endings
Add vim-haml plugin to vundle
Merge branch 'feature/update_vim_files' into develop
Add ssh config
Merge branch 'feature/add_ssh_config' into develop
Update symlinks to include ssh conf; remove bin symlink; update tmux.conf location
Merge branch 'feature/add_ssh_config' into develop
Add inputrc file; update symlinks
Merge branch 'feature/add_inputrc' into develop
Add jshint config file; update symlinks
Merge branch 'feature/add_jshint_config' into develop
Add latest script from @jgallen23
Merge branch 'feature/latest_script' into develop
Update names of git confs to match styleguide; update symlinks
Merge branch 'feature/rename_git_confs' into develop
Add mac osx scripts from @fnando
Merge branch 'feature/macosx_script' into develop