ARC Refactoring

Based on the info @pepsin provided in Issue #115 I went ahead and ran the ARC Refactor tool in Xcode.  I did some testing and didn't see any obvious bugs or things that were broken.  We should probably do some more testing to see if anything is adversely affected - but it seems like everything is ok.