Ignore .DS_Store files that OS X generates
Merge pull request #17 from MaxGabriel/postgres

Ignore .DS_Store files that OS X generates
warp 2.1
Merge branch 'postgres' into simple