updated to June 11, 2014

Note: Donovan is working on memory issues for the spin-up options