updated to use composer and updated some things to 3.1