Fixed powerline-merge-faces
load undo-tree before evil
map M-. to elisp-slime-nav
dired efap and dired single
do not reindent on { in lua-mode
require smoothscrolling
require undo-tree
add module lua to home-linux profile
added some packages
fix dired
Merge branch 'master' of github.com:laynor/emacs-conf

Conflicts:
	modules/sm-module-base.el
	packages/sm-package-powerline.el