Now that it's merged into ardour, make it unreasonable again :)

This reverts commit 0956ea8995e65b9fab1be6406b6d2050630fde84.
remove some compiler warnings
change bundle install path to not conflict w/ ardour's version.