Patch Set 1: Looks good to me, approved; Build Successful; IP review completed

Note that this adds tests and fixes our build guys but forces us to depend on Indigo as stated in my previous email. We should strive to depend on Helios for now imho unless there's good reason to move up to Indigo.