Some merge fixes
Merge branch 'enhanced-payment-flow' of github.com:ZeusWPI/Gandalf into enhanced-payment-flow