Friendlier requirements versioning.
fixing conflicts
Merge branch 'bjdelange-master'