Fix problems with non-recursive do
Add keywords and maps, port tests to deflisp itself