Updated for Xcode 6.1. Made a couple personal preference modifications after merging in last pull request from Marko with his 6.1 fixes.