trufflesuite/truffle + (6) -

    Fix incorrect assert method (sorry)
    Fix solidity syntax again (sorry)
    Merge pull request #5139 from trufflesuite/sorry-etherscan
    Copy over CompileError class from compile-solidity (sorry!)
    Fix misnamed type (sorry!)
    Fix incorrect invocation again (sorry)
    Sorry, dropped a dollar sign!
    Fix error in previous commit (sorry!)
    Fix more imports, sorry
    Fix error in splice function, and reduce errors in cleanContainers (which is still hacky, sorry).
    Finish (mostly) the conversion of allocateDefinition into allocateDefinitions, the writing of storageSizeAndAllocate, and the coversion of allocateStruct to the new format.  But the contract stuff has not been changed -- this is another intermediate commit, sorry, because I need to switch back to develop for something. :P