refactor
If nil return value, use the form buffer instead

closes #887
Merge pull request #1996 from Daxter/bugfix/887-form-buffers

[887] Respect the form buffer!
rollback shoulda-matchers
Merge pull request #2004 from Daxter/bugfix/rollback-mocha

Rollback mocha / shoulda-matchers
Merge branch 'master' into 1791-fix-signout-redirect-in-scoped-route

Conflicts:
	Gemfile