Added RPATH fix
Merge branch 'AdaptedForKatydid' of https://github.com/project8/monarch into AdaptedForKatydid
Merge branch 'AdaptedForKatydid' into AFKIntermed