Add support for configurable mingle property fields
Merge branch 'master' of git://github.com/dvanliere/bingle into dvanliere-master
Merge branch 'master' of github.com:awjrichards/bingle

Conflicts:
	bingle.ini.example