working towards full linux support
Merge branch 'master' of github.com:telamonian/boxen-linux

Conflicts:
	Puppetfile