modified parameter handling
Merge branch 'master' into lkleen-20130530

Conflicts:
	attributes/default.rb