updates to bash settings

.bash_profile

@@ -1,5 +1,7 @@
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 
+[[ -f ~/.bashrc ]] && . ~/.bashrc
+
 PATH=/usr/local/bin:~/bin:/usr/local/share/npm/bin:$PATH
 PATH=$PATH:$HOME
 set -o vi

.bashrc

@@ -1,3 +1,12 @@
+# Test for an interactive shell.  There is no need to set anything
+# past this point for scp and rcp, and it's important to refrain from
+# outputting anything in those cases.
+if [[ $- != *i* ]] ; then
+  # Shell is non-interactive.  Be done now!
+  return
+fi
+
+
 # came from Aaron Lasseigne (AaronLasseigne on GitHub)
 battery_status()
 {

bash/aliases

@@ -16,3 +16,4 @@ alias gdiff='git diff'
 alias merged?='git branch --merged'
 alias gbd='git branch -d'
 alias gpush!='git push -u origin `git rev-parse --abbrev-ref HEAD`'
+alias master!='git checkout master'