diff --git a/.gitignore b/.gitignore
index b36739c1..2fe01e92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ auto-save-list
 eproject.lst
 *.elc
 .smex-items
-places
\ No newline at end of file
+places
+backups
\ No newline at end of file
diff --git a/init.el b/init.el
index c16b9673..440e5c09 100644
--- a/init.el
+++ b/init.el
@@ -100,7 +100,10 @@
   (setq tab-width 4
         indent-tabs-mode t
         python-indent-offset 4))
-(python-tabs)
+
+;; Yelp always uses tabs.
+(add-hook 'python-mode-hook 'python-tabs)
+(add-hook 'python-mode-hook 'subword-mode)
 
 ;; Yelp always uses tabs.
 (add-hook 'python-mode-hook 'python-tabs)