Use rake ci for testing
Merge remote-tracking branch 'upstream/master' into user-management