re-arrange specs2 dependency declaration
merge from master