Support custom views for NSMenuItems
Merge pull request #18 from MohawkApps/view

Support custom views for NSMenuItems
Fix merge errors from another merge into master.

* master:
  Support custom views for NSMenuItems

Conflicts:
	lib/menu-motion/menu_item.rb
	spec/menu_motion/menu_item_spec.rb