Merge pull request #52 from chrisrhoden/slim

Slim
fixes and fades
much better handling of importing