Lots of more Github-like changes. Still work in progress.