Were you aware of the Encoder library I published?
http://www.pjrc.com/teensy/td_libs_Encoder.html
It might be nice to change your library's name slightly, so it can be used along side this long-established library without the .h files conflicting.