making matching stricter on beginning/end, but allowing extra spaces, an...

cc @yields @ianstormtaylor 

![](https://i.cloudup.com/xXZrGKoAKX.png)