CLI now tries to require local modules first
Merge pull request #57 from RobinThrift/master

CLI now tries to require local modules first