Updating to v2.0

Cleanup, Options Framework, WP 3.5 Functions, etc.