Added 'nuke' instructions.
Small typo and grammar correction in modules doc
Merge pull request #150 from petems/add_nuke_instructions

Added 'nuke' instructions.
Merge pull request #202 from toolbear/patch-1

Small typo and grammar correction in modules doc
Updates README

Noticed that Boxen won't run people/manifests/user-name.pp if it
includes dash
No hard drive encryption

Some users may not want to encrypt their hard drive, so make
sure they know the option exists to not have to encrypt their
hard drive.
Minor grammatical edit

I think in this case "bootstrap" is already a verb.
Update .gitignore

.projects should be ignored by default based on https://github.com/boxen/our-boxen/issues/48#issuecomment-13660086
update gemfile to use current boxen gem
update vender cache
Merge pull request #259 from sankage/outdated-gemfile

update gemfile to use current boxen gem
Merge pull request #256 from wallace/master

.projects should be ignored by default
Merge pull request #249 from evilensky/master

remove "get" from "to get bootstrap"
update puppetfile and readme to latest versions
Merge pull request #260 from sankage/puppet-updates

update puppetfile to latest module versions
Update nodejs version in readme
Merge pull request #241 from mattdbridges/add-fde-tip

Update readme with note about no-fde option
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	Puppetfile
	Puppetfile.lock
	manifests/site.pp
Additional homebrew packages
Updated deps

Added tig homebrew package