Merging my fork

I want some of that gitignore lovin'