Removed commented out koan code
Finished atom exercises
Small additions to macros