official OS X support in SugarCube - FINALLY!
update contributors and version file location
version bump
some NSView helpers
KVO compliance
whitespace
UIView#addSubview helper specs
oops, don't add this to OSX
include rake
revert to master's version of Gemfile
include rake in Gemfile.lock
Merge branch 'master' into osx
better gemspec
rm unused code
remove dependency on 'localized' from 'factories'
Merge branch 'master' into osx

Conflicts:
	Gemfile.lock
	lib/version.rb
added 'constants' to OS X
added bezel style
moving 'timer' package to 'cocoa', since it works on ios AND osx
commas!