Merge pull request #47 from BananaSlug/master

All my changes from the last while
Completed CC box below.
Cleaned up the XBee circuit