Remove outdated commented out code
Merge remote-tracking branch 'origin/master' into fix-security
Removed some template passing of choice keys
Removed outdated POST handler

Nothing calls this anymore
Update pickup system

Fixes choice-key attack
Merge pull request #16 from smarthimandrew/fix-security

Fix security