Updated man page, tweaked code, updated Makefile

The man page is now updated with the latest flags etc, the usage
message format is now uniform and the Makefile has been fixed.