added rubocop for testing, added git alias for cherry-picking