Tidy, fixed ARC and imports

Was importing .m in UIBarButtonItem+CustomImage