wrap lines
move macros to their own package file
add gitignore for book
Merge branch 'small_cleanup' of https://github.com/ohanar/581f-2013
add names