Fixes to work with sublime 3 and puppet 3.1