Applying diff of work done by vdaras

This should bring the branch up to where gui_enhancements was
Added fifechan specific entries to .gitignore