add attributes
Merge branch 'master' of github.com:sakai99/postgresql-ubuntu

Conflicts:
	attributes/default.rb