Minor uncrustification of a few files
Update version of NSData+Base64 to get a more normal license on it