final version 2.21
Cleans up and ignores bin dir
Merge branch 'final221'