storyboard change
Merge branch 'master' of github.com:WhisperSystems/TextSecure-iOS
storyboard change
incorporating dual settings.app/approach
reading in settings
settings setup in both app and settings bundle ftw