Clean up failing specs
Add Michael Wheeler to contributors