I added a path for my collapse python scripts.
I modified the vim alias for OSX to get things pointing to the right
executable. I also removed the '-X' flag for the Pleiades ssh alias. I know
that I read somewhere that the '-X' was a security hole, but I do not remeber
the details.

	modified:   bash_aliases
I updated the vimrc by chaning the autoindent settings for vim and GVIM. The
autoindent works right (i.e. it doesn't try to autoindent) while still
preserving my auto line wrap.

	modified:   vimrc