Clean up
Merge branch 'master' of github.com:WhisperSystems/TextSecure-iOS

Conflicts:
	TextSecureiOS/AppDelegate.m