Outdated changes and README update

Looks like I have some changes that haven't been merged. Whoops!

@abock and @jjohnson_lynker.com -- can you look at this?