remove six dep; quick demo installer added; tests updated for django1.6