Merge branch 'master' of https://github.com/jasonweitzel/canned-awesome
Adding config to gitingonore