         (setq tab-width 4)
         (setq python-indent-offset 4)
         (flycheck-mode)
+        (fci-mode)
         (global-set-key (kbd "C-x p") 'py-autopep8)
-	(column-marker-1 fill-column)))
+     ))
 
 (add-hook 'python-mode-hook 'flymake-mode)
+(add-to-list 'auto-mode-alist '("\\.py$" . python-mode))
 ;; END PYTHON CONFIGURATION
 
 ;; Org mode stuff

;; cannot change `helm-command-prefix-key' once `helm-config' is loaded.
(global-set-key (kbd "C-c h") 'helm-command-prefix)
(global-unset-key (kbd "C-x c"))

(define-key helm-map (kbd "<tab>") 'helm-execute-persistent-action) ; rebind tab to run persistent action
(define-key helm-map (kbd "C-i") 'helm-execute-persistent-action) ; make TAB works in terminal
(define-key helm-map (kbd "C-z")  'helm-select-action) ; list actions using C-z

(add-to-list 'auto-mode-alist '("\\.jade\\'" . jade-mode))
(add-to-list 'auto-mode-alist '("\\.feature\\'" . feature-mode))

;; jslint and coffee mode
(require 'flymake-jslint)
(add-hook 'js-mode-hook 'flymake-jslint-load)
