change defaults to be more sane
1.0.0
fix old npm from whining
fix merge conflicts