Added stubs for mergeFasta and convertGff

Also a lot of whitespace changes and some tests.