WP Theme v3
Merge http://github.com/samhadsall/Dev