switch to .local for consistency

.bash_aliases

@@ -57,6 +57,6 @@ alias yda="youtube-dl -x --audio-format mp3"
 ##### Mac OS Specific #####
 alias fl="open -a ForkLift"
 
-if [ -f ~/.bash_local_aliases ]; then
-    . ~/.bash_local_aliases
+if [ -f ~/.bash_aliases.local ]; then
+    . ~/.bash_aliases.local
 fi

.bashrc

@@ -71,8 +71,8 @@ if [ -f ~/.bash_aliases ]; then
   source ~/.bash_aliases
 fi
 
-if [ -f ~/.bashrc_local ]; then
-  source ~/.bashrc_local
+if [ -f ~/.bashrc.local ]; then
+  source ~/.bashrc.local
 fi
 
 # bash-git prompt

.gitconfig

@@ -1,10 +1,12 @@
-
+# local user config, usernames, etc
+[include]
+    path=~/.gitconfig.local
 [color]
     diff = auto
     status = auto
     branch = auto
     interactive = auto
-    ui = auto
+    ui = true
 [alias]
     # Shorten some often used commands
     b = branch
@@ -47,6 +49,3 @@
 	clean = git media clean %f
 	smudge = git media smudge %f
 	required = true
-# local user config, usernames, etc
-[include]
-    path=~/.gitconfig-local