Merge pull request #1 from cboyden/master

Tests that pass on master + Panopoly 1.6
Merge pull request #2 from cboyden/master

update ignores for mac; cleanup formatting