Fixed up the readme to account for the recent refactoring and wiki additions