removed issues from readme (use github issue tracker), updated credits, updated changelog
fixed merge conflicts (note to self: pull before)