Reset artifact suffix to 2.11.
Bump to 1.7.1-SNAPSHOT.
Merge branch 'scala_2.10' into scala_2.11