Modifications for work machine at Inigral.
modifications to get rvm working properly
add PGDATA env var to get postgres to work
Modified .gitconfig to use simple push as the default.
Added a handful of screen/ssh aliases. Updated .gitconfig also.
Added handy stuff to .gitconfig. Added johnson alias to .bashrc.
Added .bundle_repos.
Added formatting rules for .erb files in vim. Added ssh server aliases for all remaining servers.
PS1 trickery! Also added ssh alias for nas2
Added aliases for starting/stopping Schools App (scapp_on/scapp_off)
Reworked alias shenanigans into a separate file and a small bit of logic.
underped some derpery
normalizing bundles
Merge branch 'osx_cole_inigral'