add more complex factoryies with some specs
Merge branch 'master' of github.com:dryade/chouette