I have merged all the functional code of both repositories and am going to deploy it on the test server to start bug tracking.  Functional code is basically all the code that site sin the /planetlab/ dir of the web root.  This is all the basic code needed to interface with the API outside of drupal.  Any various configurations and drupal settings, we felt, were not necessary parts of the merge because one of the main strengths of using drupal is to allow each PLC to maintain their own GUI appearances and styles.  Once i start debugging and testing I'll post the big changes in the merge as I get to them and talk about the differences and reason for style of merge. 

This should be a good way to open discussion with 1lab and hopefully allow them to make some comments about decisions made and give advice.