@wip tags shouldn't get committed...
Reformulated the require-er to better handle symlinks.
Merge remote-tracking branch 'origin/master'
Merge branch 'KFSQA-606'
No @wip's on master!
Merge branch 'master' into KFSQA-573