Merge pull request #170 from datacratic/upstream_07_04_2014

Upstream 07 04 2014
Merge pull request #173 from datacratic/upstream_14_04_2014

Upstream 14 04 2014
Update comments on fullLocationString

Add METRO to the end of the string description
Merge pull request #175 from alkhatib/patch-2

Update comments on fullLocationString
Merge pull request #20 from rtbkit/master

Bring in changes for DMA:METRO