Change YOUR_CONFERENCE_NAME to WAFER_CONFERENCE_NAME and add Billable.me URL setting.
Merge branch 'master' of github.com:CTPUG/wafer

Conflicts:
	wafer/settings.py
Merge branch 'master' of github.com:CTPUG/wafer