Pull

And apparently changing DS store. One of these days I'm going to get
all of those files and their derivatives locked into gitignore..