Put subcommands in alphabetical order.

Also, ignore swap files in .gitignore.

Change-Id: I402d8c2f01b96ce30a8e635b583465512a988932