Ignore swp and swo files
Gemstone overviews
conflict resolution for pages_controller