Merge branch 'master' of https://github.com/jmuhlich/hmslincs

> Please enter a commit message to explain why this merge is necessary,
> especially if it merges an updated upstream into a topic branch.

whatever
moving salt_id field back to the canonical information (smallmolecule)
table per discussion with Caroline today.
Merge remote-tracking branch 'upstream/master'
data + some changes to signature.py

Summary of changes:

1. renamed the attribute maxtested of the SignatureData class to
   testedrange; now its value is expected to be a minmax pair of
   floats; made changes elsewhere accordingly;

2. added the attribute isprimary to the SignatureData class; (the
   signature method's *cough* signature could now be simplified by
   substituting a single parameter, compounds, for the parameters
   primary_compounds and nonprimary_compounds; the function can then
   generate the primary_compounds and nonprimary_compounds sequences
   from the compounds parameter by testing on the value of the
   isprimary attribute; I did not carry out this refactoring, though)

3. added the sequence CELL_LINES holding the names of the 6 cell lines
   used for the new data; these lines were chosen at-random-ish (that
   is, after culling some obvious losers from the pool, etc.)

4. added the dict LATEST, whose keys are targets, and whose values are
   lists of SignatureData tuples for various compounds that have the
   key as their target.

   NOTE: SOME OF THESE DATA ARE PLACEHOLDERS; I.E. THEY'RE FAKE!

   Specifically: the values for the isclinical, isselective, and
   isprimary flag were set randomly:

        isclinical = rn.random() < ISCLINICAL_CUTOFF
        isselective = rn.random() < ISSELECTIVE_CUTOFF
        isprimary = rn.random() < ISPRIMARY_CUTOFF

   with

        ISCLINICAL_CUTOFF = 2/3
        ISSELECTIVE_CUTOFF = 2/3
        ISPRIMARY_CUTOFF = 1/2

   The rest of the attributes come from real data files, although some
   of the values given for the testedrange attribute are very
   questionable; (in fact, for some drugs I was not able to make a
   reasonable guess for this attribute, so I set it to None);
Merge branch 'master' of https://github.com/hmslincs/hmslincs

> Please enter a commit message to explain why this merge is necessary,
> especially if it merges an updated upstream into a topic branch.

blahblahblah
archival: src/onetime/munge.py

This is the script I used to generate the data for JM on 12-10-09
(actually 12-10-10, it turns out).  I'm committing this script only
for archival purposes; it is not expected to run as is, since it
requires some general utility modules that I have not yet committed
(these utility modules are fairly general, entirely independent of the
hmslincs data, so their absence should not be an obstacle to
understanding what onetime/munge.py is doing); also, the script
mentions all the data files it used.  (I will commit these files too,
as soon as I have a chance.)
- checkpoint for api demo
Merge remote-tracking branch 'upstream/master'
api functionality checkpoint: datasetdata functional
add date fields
fixes issue #31 convert links to use the public "facility" ids
fix logging configuration
import the DWG information, 
- create a db table to store meta
information about all fields for public consumption
- will allow the UI to display the DWG field for displayed columns
- add the fieldinformation table
fix general search table query alias error
added a top-level base template with hms lincs site theme