gitignore .pyc files
Use 2-space tabstops in html, json files
Add some html-focused vim snippets in "mysnippets" bundle
Kill default snipmate html snippets

Conflicts with writing your own for common elements
Slightly better html snippets
More html snippets for vim
Replace virtualenv prompt with custom one.