Merge branch 'master' of /Users/matthewfrederick/IdeaProjects/conf-registration-api with conflicts.
move custom confirmation email from conference to registrant type
remove unused queries class
use custom confirmation text in email if available
Spacing
Spacing
Merge pull request #287 from CruGlobal/fix-early-reg-discount

Early registration discount not reflected in calculatedTotalDue
Add Brackets
Merge pull request #288 from CruGlobal/fix-early-reg-discount

Take into account when the registration was completed when calculating discount
correct errors
spacing v.2
add withdrawn and withdrawn timestamp to registrants
Add expenses to the gross total
Merge pull request #290 from CruGlobal/add-addl-expenses

Add expenses to the gross total
updates to docker/vagrant
 - subsequent runs of the environment work
 - ip address of database updated
Merge pull request #286 from CruGlobal/EVENT-115

Add custom confirmation email text to registrant types
update registrant count and create test for this
Merge pull request #289 from CruGlobal/EVENT-122

add withdrawn and withdrawn timestamp to registrants