0.6.8
resolve conflicts
Merge branch 'master' of github.com:antler/lichen
fixed egregious stacktrace