pineapple sage perhaps.

FataMorgana

I agree that it's a Salvia.

For confirmation: Does it have a very salvia-y smell to the leaves when crushed?

Hmm, well the smell isn't fruity or what I would describe as 'pleasant', not sage-like either...I'm hoping it will flower for me so I can post a picture. The leaves aren't strong smelling...hard to describe the smell, sort of skunky but not pungently so.