OMG waht have i done?
Fix merging conflicts in fgv.py

ready to be merged back to lmaersz2 and zed