Hotfix: Messed up rebase, patched paths.
Merge pull request #17 from tbranyen/master

Hotfix: Messed up rebase, patched paths.