Update .bashrc for Android Studio installs
Update vimrc, tmux.conf and gpg.conf
Merge branch 'macrocarpa'