add import cache
Merge branch 'testing' of https://github.com/smelt/bpm.py into testing
remove local hg clone/pull lock