Clean up master and add new SAM3X code