Begin conversion to simpliq 2.1.1 and bootstrap 3