master -> develop
Merge pull request #43 from Ink/cleanup-for-ios6

Updating URL references from master to develop