First pass at switch view.
Merge remote-tracking branch 'artsy/master' into switch-view

Conflicts:
	Kiosk.xcodeproj/project.pbxproj
Addressed feedback.
Merge remote-tracking branch 'artsy/master' into switch-view

Conflicts:
	submodules/Alamofire
Merge pull request #53 from AshFurrow/switch-view

@1aurabrown => Switch View