Updated to current setup of bundles and orogen_loaders
Merge branch 'master' of git://github.com/auv-avalon/bundle
git stash popMerge branch 'master' of git://github.com/auv-avalon/bundle
Current bundle for avalon