Merge branch 'release/0.2.4' into develop
Added CSV, PSV, and TSV to common output formats
Release 0.2.5
Merge branch 'release/0.2.5'
Merge branch 'master' of github.com:lucifurious/kisma