Fixed issues with iOS7 macros
Merge branch 'master' of github.com:zwopple/ZWPTextAttributes