Some static layout done for the opcount graph tool.
Fixed merge conflict for stupid vi swap file.
Added *.swp to .gitignore for vim.