Merge branch 'release/0.6-3'

* release/0.6-3:
  Update description and News for release
  Fixes to help noted by check()
  Examples of using AddLinesToRasterPlot with colours
  PlotRastersFromSweeps: PlotSpikes, PlotDividers, panel.{first,last}
  Add plot.spiketimes method so that we can call plot() on a spiketimes object
  Handle multiple colours in AddLinesToRasterPlot
  Remove longstanding duplicate param documentation warning
  eclipse: ignore RStudio project
Merge branch 'release/0.6-4'

* release/0.6-4:
  Prepare news/description for v0.6-4
  Accept more than one odour presentation window
  Don't let stimulus panels spill out of plot area
Merge branch 'release/0.6-5'

* release/0.6-5:
  Prepare for release v0.6-5
  Return call in smooth_decimate result
  Better example for smooth_decimate (that is actually run)
  Give smooth_decimate a sides option (that is passed on to stats::filter)
Merge branch 'release/0.6-6'

* release/0.6-6:
  Prepare for 0.6-6 release
  Add frequency, deltat and extend arguments to smooth_decimate
Merge branch 'release/0.6-7'

* release/0.6-7:
  v0.6-7
  Use null as default value for baselineWindow in OdourResponseFromSpikes()
Merge branch 'release/0.7'

* release/0.7:
  Prepare for 0.7 release
  Add tests for new fix of spike counting for merged spiketimes objects
  fix bug when counting spikes after merging a shorter block with a longer block
  test new baselineWindow=NULL
Merge branch 'release/0.7-1'

* release/0.7-1:
  Prepare 0.7-1 release
  Update rstudio project file
  test for new subset.spiketimes functionality
  Can subset.spiketimes by channels even when some (other) channels are repeated
  Add man/ and NAMESPACE for devtools install compatibility
  git: no longer ignore man/ and NAMESPACE - so that we can install with devtools
  More details in README.md
  add auto-generated README
Merge branch 'release/0.7-2'

* release/0.7-2:
  Prepare 0.7-2
  allow subset.spiketimes with duplicated channels but warn
Merge branch 'release/0.7-3'

* release/0.7-3:
  Prepare 0.7-3
  better docs plot.spiketimes
  STY Change quoting of + and [.spiketimes function definitions
  Include all examples within package
  roxygenise
  Rename as.spiketimes to spiketimes to indicate that it is default constructor
  Docs for merge.spiketimes mergedwaveinfo attribute
  Add new mergedwaveinfo attribute in merge.spiketimes
  whitespace tabs -> 2 spaces
  typo in NEWS
Merge branch 'release/0.8'

* release/0.8:
  Prepare v0.8
  remove yrange argument from scale.ts
  Change PlotFrequency arg to freq
  fix PlotOdourResponseFromSpikes no longer insists on a baselineWindow
  partial fix for scale.ts check warnings
  roxygenise with roxygen2 v3.1
Pass on other arguments passed to smpsth
Merge pull request #6 from ajdm/patch-1

Pass on other arguments passed to smpsth
update to roxygen2 v4
Bump version for development
Merge branch 'master' of github.com:jefferis/gphys

* 'master' of github.com:jefferis/gphys:
  Pass on other arguments passed to smpsth
Fix bug in PlotRasterFromSweeps docs

* presumably a change in how roxygen handles character escapes
Bump version to 0.8.1
Teach PlotRasterFromSweeps to colour dividers as specified by user
Merge pull request #7 from ajdm/sepcols

Teach PlotRasterFromSweeps to colour dividers as specified by user
roxygenise new arg for PlotRasterFromSweeps