merging the two separate change logs into changelog.html, updating with changes up to Oct 4th, 2013