Merge pull request #26 from slwaller/master

fixing routes/forms