Remove stray 'require' that nobody knows why it was introduced. Oops
Allow relative paths
Merge pull request #1088 from jordansissel/prep14master

Prep14master