issue #433 doc clarification for command-line switches
Added details on Paramorama
Additions for #514
Edits to #300
Add plugins to .gitignore
Merge of 3d290dc2eedc165701a0920c9ddc86af84db5722
Additions to help
Edited setup.py to accomodate 32 and 64 bit architectures on linux
Merge branch 'master' of https://github.com/CellProfiler/CellProfiler
Fixed misplaced location for cellprofiler/utilities/setup.py
Merge remote-tracking branch 'upstream/master' into experimental