updates gitignore, adds subup, adds rainbow paren and clojure settings
Merge branch 'master' into osx