Accidentally had that shit paused.
AutoCommit: 2014-05-14 23:09:27.002696
AutoCommit: 2014-05-14 23:23:28.592832
AutoCommit: 2014-05-14 23:37:30.674996
Interim checkin so I can mess with smp's branch.
Merge branch 'smp'