Issue35take2

I tried to create a clean pull request for issue35 but alas it still contains all the commits from 'devtools_import_export'

How can I preserve my own development branch history and still create clean (1 commit) pull requests?

I used equivalent of `git checkout -B issue35take2 master && git merge --no-ff devtools_import_export`.

Well, at least my branch histories are a lot cleaner now:

https://github.com/anaran/devtools-snippets/network