massive ios7 update
Merge branch 'master' of github.com:colbyfayock/minimal.iOS