Updated README.md to reflect current status; removed some files from upstream that we don't need
add upstream files to gitignore so we can merge from upstream a bit easier