diff --git a/.vimrc b/.vimrc
index c6e7c267..8961a9cf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,9 +13,20 @@ set autoread
 " Use XA_PRIMARY clipboard by default
 set clipboard=unnamed
 
+" Python stuff
+au BufNewFile,BufRead *.py " Set up nice PEP8 indentation
+			\ set tabstop=4 |
+			\ set softtabstop=4 |
+			\ set shiftwidth=4 |
+			\ set textwidth=79 |
+			\ set expandtab |
+			\ set autoindent |
+			\ set fileformat=unix
+
 " Miscellaneous options
 set incsearch " Search while you type
 set number relativenumber " Relative line numbering
+set encoding=utf-8
 
 " Enable 256-color support
 " All of my machines support 256-color so this should be fine