Updated makefile, wiki generation and wiki itself
Fixed missing hyphenation field
Updated readme