Remove Guardfile

Signed-off-by: crynobone <crynobone@gmail.com>
Reorder uses.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	src/Model/User.php