Readme updates, needs merge into sraj:master