Added OS X Junk to gitignore
Merge branch 'master' into controller-spec