add option to create sub directory
actual code
better english damnit!
Merge branch 'develop' of git://github.com/jkaberg/CouchPotatoServer into jkaberg-develop
Proper variable naming
Merge branch 'refs/heads/jkaberg-develop' into develop