Updates and regorganises vimrc
Updates $PS1, adds rdark terminal support
Merge changes from regulus or something