Jonz

many updates to master, resolved merge conflicts with heroku