Fixed C-style indenting options in vim modelines
Added context menus to the network tree
Fixed segfault with /msg
Merge branch 'master' into newsettings