Fixed typo
Updated postgres version attributes to support future major versions, and general associated cleanup.
Merge pull request #154 from engineyard/DATA-319

Updated postgres version attributes to support future major versions, and general associated cleanup.
Added missing "run" statement in config.ru
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cookbooks/main/recipes/default.rb
Update to OpenSSH 6.6p1

Should really work out how to disable this recipe once the default
version in the stack makes it unnecessary.