Cleanup and bug fixes

Fixes issue #17
Added test script and various test directories
Shortened test files
Added some comments and misc cleanup.
Clarified comment
deleted line
Merge pull request #20 from subutai/issue_17_and_misc

Cleanup and bug fixes