Added auto-complete support
Merge branch 'master' of github.com:dparnell/emacs_config