ffmpeg is an excellent conversion tool that does some minor editing (splitting, joinging, etc). Its command line based and has a bit of a learning curve, buts its the swiss army knife of conversion software.
Shotcut is an excellent editor I cam across a few weeks back. Open source and free. If you have ever used video editing software it will look and feel like the other top editors. I had no trouble diving in and doing basic edits.