Thanks for the help and yep, I only have Ubuntu installed on this machine.
I tried doing what you suggested with boot-repair. I was able untick "Separate /boot/efi". I could not change the box for "Separate /boot" since it was 'greyed out', but it was checked and set to sda2.
However, when I tried to apply these changes I got the following message.
GPT detected. Please create a BIOS-Boot partition (>1MB, unformatted filesystem, bios_grub flag). This can be performed via tools such as Gparted. Then try again.
Alternatively, you can retry after activating the [Separate /boot/efi partition:] option.
So I used gparted and created such a partition and then reran boot-repair which had me install and reinstall some grub-pc packages and said it was fixed.
The url with the results are at: http://paste.ubuntu.com/1318414/
It seems like Grub is pointed to the right place now, though I'm confused a bit by what bios_boot partition that boot-repair had me make is doing.
Dare I resetart this sucker?