Updated load path for marmalade; still not ideal.
Changed color of modified files in git (from master).