Rewrite of Parser
Merge branch 'master' of github.com:grill/lisps