placeholders now work correctly

Added a new, optional placeholder indicator. The regex I'm using to
parse these is probably not a good idea, but it's working so far...