Fixed some problems in how configuration is handled
Fixed some problems in how configuration is handled

Change-Id: I6e2ba21a0928d4e9a2c1b202ac94e08e66a4fadd

clconway/shipshape,google/shipshape,clconway/shipshape,google/shipshape,google/shipshape,google/shipshape,clconway/shipshape,clconway/shipshape,google/shipshape,google/shipshape,clconway/shipshape,google/shipshape