migrating to bootstrap 3
Merge branch 'master' of https://github.com/dlthomas/snowdrift
Merge github.com:strbean/snowdrift

Conflicts:
	config/postgresql.yml
added some files to gitignore that are variable based on local build
removed postgresql.yml from git (still in my local files)
added template version of postgresql.yml based on the primary repo
added instruction to duplicate postgresql.template to be postgresql.yml