Update vimrc
Merge
Add bzr ignore
Add javascript indentation