Merge pull request #290 from onceuponatimeforever/master

.gitignore includes .DS_Store, tags, and sublime projects