 ;; integrate with auto-complete (shows only snippets)
 (defun my/expand-yasnippet() (interactive)
        (auto-complete '(ac-source-yasnippet)))
-(global-set-key [backtab] 'my/expand-yasnippet)
-(global-set-key [(shift tab)] 'my/expand-yasnippet)
+(global-set-key [backtab] 'yas-expand)
+(global-set-key [(shift tab)] 'yas-expand)
+(setq yas-fallback-behavior '(apply my/expand-yasnippet))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; flycheck ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (setq-default flycheck-emacs-lisp-load-path 'inherit)

                 ))
(require 'auto-complete-config)
(setq-default ac-sources
              '(ac-source-yasnippet
                ac-source-dictionary
                ac-source-words-in-same-mode-buffers
                ac-source-filename

;; Author: Dan Harms <danielrharms@gmail.com>
;; Created: Friday, February 27, 2015
;; Version: 1.0
;; Modified Time-stamp: <2016-03-09 13:02:15 dan.harms>
;; Modified by: Dan Harms
;; Keywords:

