Merge pull request #1 from jdangerx/master

Updates to everything
tries to run origen properly now