Migrate to GCE
Changes to fix a silly merge
Merge branch 'crhym3-gce'