Cleaned up vapour.js formatting

Also corrected minor formatting issues in disable.js