* Remove hardcoded paths to fix randomly failing tests * Use correct function for merge path
* Update macaron * Various wiki bug fixes