Solarized dark is set to default
Added puppet mode

Conflicts:
	init.el
Solarized theme

Conflicts:
	init.el
Merge branch 'master' into devel

Conflicts:
	init.el