Update setup

Move reload bashrc commands before reloading terminal.