Working on merging/updating changelog, news, and makefile