Merge pull request #927 from birarda/master

README touchups for local stack