Various changes
Merge branch 'mist_up_chaos' of https://github.com/mistio/mist.io into mist_up_chaos