fixed card_controller conflict from newindex merge
tweaked Wagn::Conf / default environment
first stab
fixing up routing/delete handling a bit more
fixing up tests, esp for broken types
a bit more broken_type handling
resolved boot.rb conflict
fixed load_card bug
fixed duplicate action cgi vars
fix wagn:create
needed for 1.8.7 to test successfully