update ignores for mac; cleanup formatting
Merge pull request #2 from cboyden/master

update ignores for mac; cleanup formatting