Update cardboard to 2.1 and add in all the surrounding files

Testing Travis