diff --git a/bashrc b/bashrc
index e6d1e37..9592ac8 100644
--- a/bashrc
+++ b/bashrc
@@ -15,7 +15,7 @@ else
 	USER=$(whoami)
 fi
 
-PS1='\[\033[0;32m\]${USER}@\h\[\033[0m\] [\[\033[0;33m\]\w\[\]\[\033[0;32m\]]'$PROMPT_SUFFIX
+PS1='\[\033[0;32m\]${USER}@\h\[\033[0m\] [\[\033[0;33m\]\w\[\]\[\033[0;32m\]]\n'$PROMPT_SUFFIX
 export PATH=$PATH:~/bin:~/local/bin
 
 function tmux_title {
diff --git a/setup.sh b/setup.sh
index b96cd7b..154f63d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LINK_FILES=(bashrc vimrc tmux.conf gitconfig dircolors)
+LINK_FILES=(vimrc tmux.conf gitconfig dircolors)
 mkdir ~/.home-git-back 2>/dev/null
 for file in ${LINK_FILES[@]}; do
 	if  [ ! -L ~/.${file} ] ; then
@@ -12,7 +12,9 @@ done
 
 [ ! -d ~/.bash-git-prompt ] && git clone https://github.com/nold360/bash-git-prompt.git ~/.bash-git-prompt
 
-mkdir ~/.vim 2>/dev/null
+mkdir -p ~/.vim/bundle 2>/dev/null
 [ ! -d ~/.vim/bundle/Vundle.vim ] && git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
 vim -c ":PluginInstall" -c ":q" -c ":q"
+
+grep -q "source $(pwd)/bashrc" ~/.bashrc || echo "source $(pwd)/bashrc" >> ~/.bashrc
diff --git a/vimrc b/vimrc
index 3b7e06c..538c95c 100644
--- a/vimrc
+++ b/vimrc
@@ -1,11 +1,3 @@
-"Installation:
-" $ mkdir -p ~/.vim/bundle
-" $ git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-" Insert the contant of this file into ~/.vimrc
-" $ vim
-" Type: :PluginInstall <ENTER>
-" Restart vim & be happy :)
-
 set nocompatible              " be iMproved, required
 filetype off                  " required
 set rtp+=~/.vim/bundle/Vundle.vim