ENH: Adding function conj
Fixing typos
After talking with Mark W. it does not seem that the if lines are needed
Merge pull request #125 from Dapid/add_conj

Adding function conj (still failing some tests, but will apply fixes later on)
Fixing PR #125 for allowing casting between conjugate and ints (needed floats first)