Upgrade to gradle 2.2.1
Rename com.fsist.stream package to com.fsist.stream2 temporarily, to help migrate our project from the old future-streams implementation