Use gradle v1.9.
Ignore .swp files from vim.
Remove unused code and clean up formatting.