Fixed merge conflicts, fixed elixir, erlang icons, added SVG, MongoDB

This took quite a bit of conflict resolution, but it seems to be fixed now.

I've added a `test-files` directory with zero-length files with different suffixes for easy checking that the icon-mapping is working.

Elixir & Erlang icons are working, also added SVG, MongoDB & cleaned up some formatting.