Merge branch 'master' of https://github.com/unflores/dot-vim
updated gitconfig
Start changing rakefile to bash install file so that it works with more systems
added function to do things.  life is better
adding the append functionality for bashrc, adding colors
derp bad format for code
fixing indentation of .gitconfig
So I guess home is already defined, so don't need that
added pull rebase
adding a summary to bashrc, can be called with just "summary"
oplah, should probably have one of these
adding git completion
setting default for push to tracking
adding tracking to pull as well
Make things better!!!!1
Merge branch 'master' of ssh://github.com/unflores/dot-files

Conflicts:
	.bashrc
Ensure that bash_profile is connected for macs, ensuring that rbenv is loaded if it exists
Adding more aliases, and fixing bash_profile reference
Readding