<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/mtlynch/mlab-observatory ampersand-fixer</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/opentechinstitute/mlab-observatory/pull/36'>https://github.com/opentechinstitute/mlab-observatory/pull/36</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Merging in name change for result grouper.</li>
  <li>Fixing test names in result_grouper_test.</li>
  <li>Fixing bug with ampersands in ISP names.</li>
  <li>Merge commit '1353ddce5bf203075bbb309011127910c89a5c23' into ampersand-fixer</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>R</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/36/files#diff-0">convert_from_telescope/result_grouper.py</a>
    (19)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/36/files#diff-1">convert_from_telescope/result_grouper_test.py</a>
    (34)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/36/files#diff-2">convert_from_telescope/telescope_data_parser.py</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/36/files#diff-3">convert_from_telescope/telescope_data_parser_test.py</a>
    (21)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/mlab-observatory/pull/36.patch'>https://github.com/opentechinstitute/mlab-observatory/pull/36.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/mlab-observatory/pull/36.diff'>https://github.com/opentechinstitute/mlab-observatory/pull/36.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/opentechinstitute/mlab-observatory/pull/36">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AC7qBEg3t-ptIvJDWvmxEyO6XkB1_Hr0ks5nfbXbgaJpZM4DPoL0.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
  <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
    <link itemprop="url" href="https://github.com/opentechinstitute/mlab-observatory/pull/36"></link>
    <meta itemprop="name" content="View Pull Request"></meta>
  </div>
  <meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>