fix syntax  & add macros & add packages
fix conflicts
fix coflicts(again!)
fix conflicts(again...)
Merge branch 'master' of https://github.com/rizaudo/.emacs.d

Conflicts:
	init.el