Cleanup, rename a few things, and add brackets to conditionals for safety
Cleanup and update demo project to use cocoapod
Bump version to 1.1