Fix asset tests for latest sprockets (sigh)
Fix layout of box tabs
Merge branch 'master' of github.com:SpontaneousCMS/spontaneous