refactoring the form builder.
Merge branch 'master' into forms
Using array_set() in Session::flash() for consistency.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Merge branch 'master' into forms