fix 00_nmatrix_spec.rb#297  # FIXME: Actually test that values are correct.
Add 2.1.1 to yaml

Bug https://github.com/SciRuby/nmatrix/issues/214
Merge pull request #216 from thisMagpie/master

Add 2.1.1 to Travis
Merge pull request #213 from rve/issue_213

Fix complex_conjugate_bang test function
Merge branch 'master' of github.com:SciRuby/nmatrix
Fixed spec problem
add non-in-place & test1
add non-in-place conjugate & test2
add non-in-place conjugate test for all dtypes
add non-in-place conjugate test for all dtypes
Improved specs for complex conjugate
Fix #210, complex conjugate not-in-place, and also improved testing for
in-place complex conjugate. By @rve and @mohawkjohn. Closes #210.
Merge commit '65c75d194742b955661486cd9d7323536c3bc5d4'

Conflicts:
	spec/00_nmatrix_spec.rb
Update history for rve's complex conjugate stuff.