Version bump to 2.1.0
Added mandrill support