nvidia - Ubuntu 14.04 System freezes on wakeup from suspended state

I did a clean install of Ubuntu 14.04. When I resume from suspended the system freezes after I enter my password. I am forced to power off and start again. I had a similar problem on this laptop when I upgraded to 13.04 and don't recall how I fixed it.

BOOT_IMAGE=/vmlinuz-3.13.0-24-generic root=/dev/mapper/ubuntu--vg-root ro quiet splash pcie_aspm=force vt.handoff=7

/var/log/pm-suspend.log

$ lspci -vnn | grep -A12 VGA
01:00.0 VGA compatible controller [0300]: NVIDIA Corporation GT216M [GeForce GT 230M] [10de:0a28] (rev a2) (prog-if 00 [VGA controller])
    Subsystem: Hewlett-Packard Company Device [103c:3659]
    Flags: bus master, fast devsel, latency 0, IRQ 47
    Memory at d2000000 (32-bit, non-prefetchable) [size=16M]
    Memory at c0000000 (64-bit, prefetchable) [size=256M]
    Memory at d0000000 (64-bit, prefetchable) [size=32M]
    I/O ports at 6000 [size=128]
    Expansion ROM at d3080000 [disabled] [size=512K]
    Capabilities: [60] Power Management version 3
    Capabilities: [68] MSI: Enable+ Count=1/1 Maskable- 64bit+
    Capabilities: [78] Express Endpoint, MSI 00
    Capabilities: [b4] Vendor Specific Information: Len=14 
    Capabilities: [100] Virtual Channel