Fixed some OSX related issues.
Merge branch 'master' of https://github.com/pimms/scrap
Updated gitignore
wut