Add a node content type configuration value
Merge branch 'master' of github.com:buddycloud/buddycloud-xep into issue-20

Conflicts:
	sections/50.node-config.xml
Add ATOM default
Merge branch 'master' of github.com:buddycloud/buddycloud-xep into issue-20

Conflicts:
	sections/50.node-config.xml
Merge pull request #22 from surevine/issue-20

Add a node content type configuration value