Fix gitignore
Merge remote-tracking branch 'upstream/master'
Fix order of sed arguments so it works on both mac and ubuntu.
Merge pull request #12 from davidcrawford/fix-mac-make

Fix make install on Mac OS X