Ian finally got everything back together and decided to check the K&N air filter. It seems to have gone missing being replaced by some cheap piece of junk I've never heard of.
If anyone has a Mr. Smith's Fast Lube in their area my advice would be to stay away from them.