Adding settings for mapsherpa account.
Merge branch 'mapsherpa' of https://github.com/mapsherpa/bootstrapify into mapsherpa

Conflicts:
	.gitignore