Updated INSTALL, TODO
merge master