Added puppet mode

Conflicts:
	init.el
Solarized theme

Conflicts:
	init.el