Refactoring towards #27
Merge branch 'master' of https://github.com/fsprojects/Paket