Merge remote-tracking branch 'origin/master' into dev
Changed tabbing
Removed the test targets - no longer needed
Renamed to recipes
Changed base dir - however, this might be wrong
Added a recipes properties file
Included the properties file
Merge remote-tracking branch 'origin/dev'