Remove pesky ds_store :|
Clean up
Fix merge conflicts
Merge pull request #6 from MarcGarreau/cleanup

Cleanup