Hi,
fpgaminers version of merging his phatk branch with luke-jr's branch seems to miss some of luke-jr's patches, and github shows conflicts. So I gave it a shot myself and made a new version. Because patches often didn't apply, I had to merge manually. So here it is:

...

Have fun!