Added support for button edge insets
Fixed some potential retain cycles warning picked up by Xcode 4.6