Re-add address search

#178 got lost in the mix. This adds it back in, with slight updating so it fits with our existing setup. 

![2014-06-10 04 27 14 pm](https://cloud.githubusercontent.com/assets/86435/3236447/19b207fa-f0de-11e3-8b81-828507d3607c.png)