More indentation changes and set NERDTree to ignore .pyc files.
Merge branch 'master' of git://github.com/nicr9/dotfiles

Conflicts:
	dotvimrc