Fixing merge conflicts and stuff

bash/.bashrc

@@ -50,11 +50,15 @@ export HISTTIMEFORMAT="%F %T: "
 export HISTSIZE=1000
 export HISTFILESIZE=2000
 
-# Prompt - make sure there is a terminal 
-if [ -z $TERM ]; then
+if [ ! -z "$TERM" ]; then
     export PS1="\[$(tput bold)\]\[$(tput setaf 2)\][\u@\h \W]\\$ \[$(tput sgr0)\]"
 fi
 
+if [ ! -z "$VIRTUAL_ENV" ]; then
+    #export PS1="[$(basename "$VIRTUAL_ENV")] \[\u@\h \W]\\$"
+    export PS1="[$(basename "$VIRTUAL_ENV")] $PS1"
+fi
+
 # fedoras stupid command-not-found shit
 unset command_not_found_handle