added two tests; trying out the branch
Merge branch 'master' of https://github.com/jcrawley/Spitfire
Merge branch 'master' of https://github.com/jcrawley/Spitfire
removed iki parent directory
Merge branch 'master' of https://github.com/jcrawley/Spitfire
fixed merges
Merge branch 'master' of https://github.com/jcrawley/Spitfire