LOTS of changes

Cleaned up dzen stuff!
Added a snippet or two to vim snippets
changed up vimrc
Merge branch 'master' of http://github.com/laserdude11/dotfiles

Conflicts:
	vim/bundle/snipmate/snippets/java.snippets
some updates and shit