Fix reform
Move form year to date in scenarios
Merge pull request #319 from benjello/master

Fix reform