Update msfdatabase.py

Re-ordered the joins and changed to a left join so that we would get all values even if some fields were null.