Fix manual removal button on localizations and whitelists
Update Cocoapods
Tweak in hopes of fixing Get Started issue
Build with Yosemite SDK, bump to v2.0.1
Fix localization issues
Bump version to 2.0.2
Merge pull request #1 from SelfControlApp/master

Merge into fork.
Merge branch 'master' into sam-clean-up-time-slider-display

Conflicts:
	Podfile
	Pods/Pods-MASPreferences-Private.xcconfig
	Pods/Pods.xcconfig
	Pods/Pods.xcodeproj/project.pbxproj
	Pods/Target Support Files/Pods/Pods-resources.sh
	TimerWindowController.m
Updating pods after merge with master.