merge from bioc-devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/flowCore@86224 bc3139a8-67e5-0310-9ffc-ced21a209358
Basic FCS3.1 support.
Merge pull request #20 from jspidlen/master

Basic FCS3.1 support.
Commit made by the Bioconductor Git-SVN bridge.
Consists of 2 commit(s).

Commit information:

    Commit id: 96322452c7e587c708de0ad577dd5b4eb3fd73b3
    Commit message:
    Basic FCS3.1 support.
    Committed by Josef Spidlen <jspidlen at bccrc.ca>
    Commit date: 2014-03-27T11:49:19-07:00

    Commit id: 068f78556e25e4349f600b0d356026ffab3dbf97
    Commit message:
    Merge pull request #20 from jspidlen/master

    Basic FCS3.1 support.
    Committed by Mike Jiang <wjiang2 at fhcrc.org>
    Commit date: 2014-03-31T10:22:27-07:00

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@88193 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'master' of github.com:RGLab/flowCore
Merge commit 'e44bae69c1602709ce69428458b1271b899cd4a6'
Remove dependency on 'feature' to avoid unwanted dependency on tcltk
A collection of small changes that silence R CMD check warnings
resolve the conflicts during the merging from removeFeature branch