Update some paths
Merge remote-tracking branch 'upstream/master'
fix recipes
fix some recipes, add beetle psx
Merge pull request #146 from fr500/master

Adde beetle psx and update some stuff to work with the buildbot