merge files into options in order to match teaspoons api
files param is now merged into options
fix specs
Merge pull request #29 from samu/master

merge files into options in order to match teaspoons api