Updated bash profile

Now using vi mode instead of emacs (It is long past time)

Now checking for .bash*_local and including it.
This is where I plan on adding settings that will only apply to one
host.

Fixed Android SDK path for OSX.