don't import everything from datetime; fixed conflicts checking (again, slow but works); using makedirs instead of mkdir to create parents
Merge branch 'master' of github.com:fluxer/spm