cleanup-load-path

Tweak load path to avoid requiring absolute paths

<!---
@huboard:{"order":19.5,"milestone_order":30,"custom_state":"ready"}
-->