quick n' dirty merging from my local copy and a copy that I edited using github.com