(WIP) Support AWS in addition to VirtualBox

Please don't merge this work-in-progress.