Version 2.0 complete

Signed-off-by: Charles Steinkuehler <charles@steinkuehler.net>