Fixed dependencies for 0.13.x style macros
Merge pull request #546 from sksamuel/master

Fixed dependencies for 0.13.x style macros
Update SExp rendering and cleanup code