update so that it builds on my linux and mac boxes
on graceful exit, not that we do so due to EOS
add .s.diff to .gitignore