Branch Clean Up

See Django Market Themes