Fixing a version control meltdown
Finished fixing git meltdown.  Importing serialport should work normally now.