issue #1279 back on Mac, needs a few more tweaks to get it right.
issue #1285 int16 arithmetic caused wraparound in parent/child pixel location concordances + tests
issue #1286 fix bug in convex_hull_transform for completely masked image
Build requires nose too
Build now needs bioformats too.
Move findlibjvm.class URL from SVN to linked_files
issue #1278 set the default intensity scaling to "normalize"
Prevent misidentified module errors in modules derived from Identify
initial checkin of partially-complete cpartists module
Apparently functional artists
Made workspace viewer work with new CPImageArtist
Added masks
Merge branch 'cpartists' of github.com:LeeKamentsky/CellProfiler into cpartists

Conflicts:
	cellprofiler/gui/cpartists.py
	cellprofiler/gui/viewworkspace.py