Merge branch 'hotfix/remove-podlock'
Updated to work with Xcode 5.1
Merge pull request #27 from dvanwinkle/master

Updated to work with Xcode 5.1
Merge branch 'master' into develop

* master:
  Updated to work with Xcode 5.1