Add podspec, general cleanup
Merge upstream.