Merge pull request #1 from wafels/master

psi_ft in the cwt method needs to be conjugated.
Bug solved for cone of influence (COI) calculation
Merge branch 'master' of github.com:regeirk/kPyWavelet
+ ‘2d.py’
+ ‘__init__.pyc’
+ ‘wavelet.pyc’
/ ‘sample.py’
New information on Torrence & Compo (1998) errata and correction for the DOG Fourier transform.
Inclusion of the cross-wavelet transform and wavelet coherence test. This update also adds plotting functions.