fix crooked ship
fix crooked ship....permanently
ACK!...too much coffeescript!!
Merge pull request #1560 from internalfx/fix-crooked-ship

fix crooked ship
Suspended pesky tests for deprecated behavior that was giving Travis the fits
Allow to override layout