JS Indentation to 2
Indented file
Font changes
Indent after yanking
Merge branch 'master' of https://github.com/raulmpad/.emacs.d_wip

Conflicts:
	mac.el