Move baseutils to master now that viewutils were merged