retina may be working
fix up constants, renaming for ugly 2x stuff, retina compiling
import insanity
Merge remote-tracking branch 'upstream/master'