diff3 is actually kinda sucky
.gitignoring .pyc files
Merge branch 'master' of github.com:caffeine-storm/dotfiles