Turned off debug mode
Fixed formatting a bit
Added .gitconfig and global .cvsignore file
Added meld as default diff and merge tool
PyMode and other settings in vimrc
Removed gitignore
merge