[emacs]Upgrading some packages.
Merge branch 'emacs_ecb' of github.com:squatched/comp-setup into emacs_ecb
Merge branch 'master' into emacs_ecb
[emacs]Adding elpa and init directories instead of .emacs.d to the load-path. Resolves a warning on startup.