update paths, macros
remove alphaexpansionnfusion
add src to util lib, fix path external libs
remove artifacts
Merge branch 'shotton-2009'