Fix mixture of tabs/spaces. Add curly brackets around ifs
Merge branch 'master' of github.com:Patternslib/Patterns