Add export --shell argument
Cleanup export
Merge pull request #1 from Birdback/master

Adds export --shell argument