Merge gitorious.org:snowdrift/snowdrift
added back trailing whitespace (md two spaces is a line break!)
added style.md file to discuss style guidelines, added mention of it to README
fixed bootstrap link
Merge gitorious.org:snowdrift/snowdrift
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
better explanation of bootstrap
update to header styles for bootstrap 3
added yesod-devel/ to ignore in case people use that
Merge commit 'refs/merge-requests/5' of gitorious.org:snowdrift/snowdrift