gistfile1.txt

 On branch master
# Your branch and 'origin/master' have diverged,
# and have 3 and 43 different commit(s) each, respectively.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   README.md
#	modified:   assets/stylesheets/guest.css
#	modified:   builder/.gitignore
#	modified:   builder/Guardfile
#	deleted:    builder/README.markdown
#	modified:   builder/app/controllers/admin/announcements_controller.rb
#	modified:   builder/app/controllers/admin/invites_controller.rb
#	modified:   builder/app/controllers/admin/sessions_controller.rb
#	modified:   builder/app/controllers/admin/system_messages_controller.rb
#	modified:   builder/app/controllers/admin/user_sessions_controller.rb
#	modified:   builder/app/controllers/application_controller.rb
#	modified:   builder/app/controllers/help_controller.rb
#	modified:   builder/app/controllers/social_networks/facebook_controller.rb
#	modified:   builder/app/controllers/social_networks/foursquare_controller.rb
#	modified:   builder/app/controllers/social_networks/gowalla_controller.rb
#	modified:   builder/app/controllers/social_networks/youtube_controller.rb
#	modified:   builder/app/controllers/social_networks_controller.rb
#	modified:   builder/app/controllers/user/invitations_controller.rb
#	deleted:    builder/app/controllers/user/registrations_controller.rb
#	modified:   builder/app/controllers/user_controller.rb
#	modified:   builder/app/helpers/admin/dashboard_helper.rb
#	modified:   builder/app/helpers/monitors_helper.rb
#	modified:   builder/app/helpers/streams_helper.rb
#	deleted:    builder/app/models
#	copied:     models/.rspec -> builder/app/models/.rspec
#	new file:   builder/app/models/admin.rb
#	new file:   builder/app/models/rule.rb
#	new file:   builder/app/models/rule/keywords.rb
#	new file:   builder/app/models/rule/location.rb
#	new file:   builder/app/models/rule/rule_types.rb
#	new file:   builder/app/models/site/location.rb
#	new file:   builder/app/models/site/redis_cache.rb
#	new file:   builder/app/models/social_activity/error.rb
#	new file:   builder/app/models/social_network/client.rb
#	new file:   builder/app/models/social_network/rules.rb
#	new file:   builder/app/models/stream_event.rb
#	new file:   builder/app/observers/counter_cache_observer.rb
#	new file:   builder/app/observers/gnip_observer.rb
#	new file:   builder/app/observers/redis_observer.rb
#	new file:   builder/app/observers/rule_observer.rb
#	new file:   builder/app/observers/stream_observer.rb
#	new file:   builder/app/observers/superfeedr_observer.rb
#	modified:   builder/app/views/admin/announcements/edit.html.erb
#	modified:   builder/app/views/admin/announcements/index.html.erb
#	modified:   builder/app/views/admin/announcements/new.html.erb
#	modified:   builder/app/views/admin/dashboard/index.html.erb
#	modified:   builder/app/views/admin/harvester_jobs/_search_form.html.erb
#	modified:   builder/app/views/admin/invites/index.html.erb
#	modified:   builder/app/views/admin/logger/_search_form.html.erb
#	modified:   builder/app/views/admin/system_messages/index.html.erb
#	modified:   builder/app/views/layouts/admin.html.erb
#	modified:   builder/app/views/shared/_admin_overlay.html.erb
#	modified:   builder/app/views/shared/_invitation.html.erb
#	modified:   builder/app/views/user/invitations/edit.html.erb
#	new file:   builder/app/views/user/new.html.erb
#	renamed:    models/.rspec -> builder/app/views/user/show.html.erb
#	modified:   builder/app/views/widgets/templates/grid/_social_activity.html.erb
#	deleted:    builder/autotest/discover.rb
#	modified:   builder/config/application.rb
#	modified:   builder/config/environments/development.rb
#	modified:   builder/config/environments/test.rb
#	new file:   builder/config/initializers/escape_utils.rb
#	new file:   builder/config/initializers/mongoid.rb
#	new file:   builder/config/initializers/route_constraints.rb
#	new file:   builder/config/initializers/validators.rb
#	modified:   builder/config/routes.rb
#	deleted:    builder/db
#	renamed:    builder/db/migrate/20110426030615_expire_youtube_credentials.rb -> builder/db/db/migrate/20110426030615_expire_youtube_credentials.rb
#	renamed:    builder/db/migrate/20110510072133_cleanup_duplicate_archived_sa.rb -> builder/db/db/migrate/20110510072133_cleanup_duplicate_archived_sa.rb
#	renamed:    builder/db/migrate/20110524050519_cleanup_archived_social_activities.rb -> builder/db/db/migrate/20110524050519_cleanup_archived_social_activities.rb
#	renamed:    builder/db/migrate/20110526081605_cleanup_multiple_member_credentials.rb -> builder/db/db/migrate/20110526081605_cleanup_multiple_member_credentials.rb
#	renamed:    builder/db/migrate/20110615110012_fix_missing_social_activity_id.rb -> builder/db/db/migrate/20110615110012_fix_missing_social_activity_id.rb
#	renamed:    builder/db/migrate/20110624063714_cleanup_facebook_sas.rb -> builder/db/db/migrate/20110624063714_cleanup_facebook_sas.rb
#	renamed:    builder/db/migrate/20110629072738_update_archived_sa_child_social_activities.rb -> builder/db/db/migrate/20110629072738_update_archived_sa_child_social_activities.rb
#	renamed:    builder/db/migrate/20110704050012_reinitialize_updated_at.rb -> builder/db/db/migrate/20110704050012_reinitialize_updated_at.rb
#	renamed:    builder/db/migrate/20110715070427_rename_sn_identifier.rb -> builder/db/db/migrate/20110715070427_rename_sn_identifier.rb
#	renamed:    builder/db/migrate/20110717101552_convert_existing_sa_tags_into_objects.rb -> builder/db/db/migrate/20110717101552_convert_existing_sa_tags_into_objects.rb
#	new file:   builder/db/db/migrate/20110809112822_rename_email_subscribers_to_invite_requests.rb
#	renamed:    builder/db/migrate/20110810110900_add_fan_page_boolean_to_assets.rb -> builder/db/db/migrate/20110810110900_add_fan_page_boolean_to_assets.rb
#	new file:   builder/db/db/migrate/20110811063451_populate_stream_events.rb
#	new file:   builder/db/db/migrate/20110811192127_convert_social_network_rule_ids.rb
#	renamed:    builder/db/seeds.rb -> builder/db/db/seeds.rb
#	new file:   builder/db/migrate/20110809112822_rename_email_subscribers_to_invite_requests.rb
#	new file:   builder/db/migrate/20110811063451_populate_stream_events.rb
#	new file:   builder/db/migrate/20110811192127_convert_social_network_rule_ids.rb
#	new file:   builder/lib/harvesters
#	new file:   builder/lib/infinitely/gnip.rb
#	renamed:    shared/lib/tasks/jammit.rake -> builder/lib/tasks/jammit.rake
#	new file:   builder/lib/utilities
#	deleted:    builder/rerun.txt
#	new file:   builder/spec/cassettes/GnipObserver/_after_create.yml
#	new file:   builder/spec/cassettes/GnipObserver/_after_create_with_geolocation_information.yml
#	new file:   builder/spec/cassettes/GnipObserver/_after_destroy.yml
#	new file:   builder/spec/cassettes/GnipObserver/_after_update.yml
#	new file:   builder/spec/cassettes/GnipObserver/_after_update/with_Rule_going_from_active_to_inactive.yml
#	new file:   builder/spec/cassettes/GnipObserver/_after_update/with_Rule_going_from_active_to_inactive/and_from_inactive_to_active.yml
#	new file:   builder/spec/cassettes/GnipObserver/_after_update/with_changes_to_the_keyword.yml
#	new file:   builder/spec/cassettes/Rule/Actor_rule/keywords/given_a_username_for_a_keyword.yml
#	new file:   builder/spec/cassettes/Rule/setting_location.yml
#	new file:   builder/spec/cassettes/Site/with_an_address_attribute.yml
#	new file:   builder/spec/cassettes/SocialNetwork_Client/_get_id_from_username/for_Facebook/given_a_valid_username.yml
#	new file:   builder/spec/cassettes/SocialNetwork_Client/_get_id_from_username/for_Facebook/given_an_invalid_username.yml
#	new file:   builder/spec/cassettes/SocialNetwork_Client/_get_id_from_username/for_Twitter/given_a_valid_username.yml
#	new file:   builder/spec/cassettes/SocialNetwork_Client/_get_id_from_username/for_Twitter/given_an_invalid_username.yml
#	deleted:    builder/spec/controllers/admin/invites_controller_spec.rb
#	deleted:    builder/spec/controllers/admin/system_messages_controller_spec.rb
#	modified:   builder/spec/controllers/user/invitations_controller_spec.rb
#	modified:   builder/spec/controllers/user_controller_spec.rb
#	new file:   builder/spec/fabricators/account_fabricators.rb
#	new file:   builder/spec/fabricators/invite_request_fabricators.rb
#	new file:   builder/spec/fabricators/rule_fabricators.rb
#	new file:   builder/spec/fabricators/site_fabricators.rb
#	new file:   builder/spec/fabricators/social_activity/author_fabricators.rb
#	new file:   builder/spec/fabricators/social_activity/link_fabricators.rb
#	new file:   builder/spec/fabricators/social_activity/rule_fabricators.rb
#	new file:   builder/spec/fabricators/social_activity/social_object_fabricators.rb
#	new file:   builder/spec/fabricators/social_activity/target_fabricators.rb
#	new file:   builder/spec/fabricators/social_activity_fabricators.rb
#	new file:   builder/spec/fabricators/social_network_fabricators.rb
#	new file:   builder/spec/fabricators/stream_event_fabricators.rb
#	new file:   builder/spec/fabricators/user_fabricators.rb
#	modified:   builder/spec/models/account_spec.rb
#	deleted:    builder/spec/models/email_subscriber_spec.rb
#	new file:   builder/spec/models/invite_request_spec.rb
#	modified:   builder/spec/models/rule_spec.rb
#	modified:   builder/spec/models/site_spec.rb
#	modified:   builder/spec/models/social_activity/rule_spec.rb
#	new file:   builder/spec/models/social_activity/social_object_spec.rb
#	modified:   builder/spec/models/social_activity_spec.rb
#	new file:   builder/spec/models/social_network/client_spec.rb
#	modified:   builder/spec/models/social_network_spec.rb
#	modified:   builder/spec/models/user_spec.rb
#	new file:   builder/spec/observers/counter_cache_observer_spec.rb
#	new file:   builder/spec/observers/gnip_observer_spec.rb
#	new file:   builder/spec/observers/redis_observer_spec.rb
#	new file:   builder/spec/observers/rule_observer_spec.rb
#	new file:   builder/spec/observers/stream_observer_spec.rb
#	new file:   builder/spec/observers/superfeedr_observer_spec.rb
#	new file:   builder/spec/requests/user/invitations_spec.rb
#	new file:   builder/spec/requests/user_spec.rb
#	new file:   builder/spec/routing/user/invitations_controller_spec.rb
#	new file:   builder/spec/routing/users_routing_spec.rb
#	modified:   builder/spec/spec_helper.rb
#	new file:   builder/spec/support/capybara.rb
#	new file:   builder/spec/support/carrierwave.rb
#	new file:   builder/spec/support/devise.rb
#	new file:   builder/spec/support/email_spec.rb
#	new file:   builder/spec/support/mongoid.rb
#	new file:   builder/spec/support/vcr.rb
#	new file:   builder/spec/support/webmock.rb
#	modified:   builder/spec/views/user/invitations/edit.html.erb_spec.rb
#	renamed:    builder/spec/.rspec -> builder/spec_old/.rspec
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_comment_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_comment_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_favorite_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_favorite_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_favorite_ids/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_favorite_ids/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_favorites/invalid_oauth_token.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_favorites/invalid_oauth_token.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_favorites/rate_limit_exceeded.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_favorites/rate_limit_exceeded.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_favorites/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_favorites/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_follow_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_follow_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_follower_ids/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_follower_ids/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_follower_profiles/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_follower_profiles/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_following_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_following_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_following_/true_negative.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_following_/true_negative.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_following_/true_positive.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_following_/true_positive.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_friend_ids/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_friend_ids/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_friends_timeline/invalid_oauth_token.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_friends_timeline/invalid_oauth_token.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_friends_timeline/rate_limit_exceeded.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_friends_timeline/rate_limit_exceeded.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_friends_timeline/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_friends_timeline/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_message_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_message_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_messages/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_messages/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_retweet_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_retweet_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_status_/duplicate_status.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_status_/duplicate_status.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_status_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_status_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_unfavorite_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_unfavorite_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_unfollow_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_unfollow_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_user_timeline/invalid_oauth_token.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_user_timeline/invalid_oauth_token.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_user_timeline/rate_limit_exceeded.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_user_timeline/rate_limit_exceeded.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Twitter/_user_timeline/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Twitter/_user_timeline/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_comment_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_comment_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_favorite_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_favorite_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_favorite_ids/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_favorite_ids/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_favorites/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_favorites/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_friends_timeline/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_friends_timeline/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_subscribe_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_subscribe_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_subscriptions/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_subscriptions/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_unfavorite_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_unfavorite_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_unsubscribe_/no_such_user_in_the_subscription_list.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_unsubscribe_/no_such_user_in_the_subscription_list.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_unsubscribe_/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_unsubscribe_/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_user_timeline/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_user_timeline/successful.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_video/failed_upload.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_video/failed_upload.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_video/invalid_ID.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_video/invalid_ID.yml
#	renamed:    builder/spec/cassettes/SocialNetwork_Client_Youtube/_video/successful.yml -> builder/spec_old/cassettes/SocialNetwork_Client_Youtube/_video/successful.yml
#	renamed:    builder/spec/controllers/accounts_controller_spec.rb -> builder/spec_old/controllers/accounts_controller_spec.rb
#	renamed:    builder/spec/controllers/admin/dashboard_controller_spec.rb -> builder/spec_old/controllers/admin/dashboard_controller_spec.rb
#	renamed:    builder/spec/controllers/admin/harvester_jobs_controller_spec.rb -> builder/spec_old/controllers/admin/harvester_jobs_controller_spec.rb
#	new file:   builder/spec_old/controllers/admin/invites_controller_spec.rb
#	renamed:    builder/spec/controllers/admin/logger_controller_spec.rb -> builder/spec_old/controllers/admin/logger_controller_spec.rb
#	new file:   builder/spec_old/controllers/admin/system_messages_controller_spec.rb
#	renamed:    builder/spec/controllers/analytics_controller_spec.rb -> builder/spec_old/controllers/analytics_controller_spec.rb
#	renamed:    builder/spec/controllers/assets_controller_spec.rb -> builder/spec_old/controllers/assets_controller_spec.rb
#	renamed:    builder/spec/controllers/dashboard_controller_spec.rb -> builder/spec_old/controllers/dashboard_controller_spec.rb
#	renamed:    builder/spec/controllers/documents_controller_spec.rb -> builder/spec_old/controllers/documents_controller_spec.rb
#	renamed:    builder/spec/controllers/home_controller_spec.rb -> builder/spec_old/controllers/home_controller_spec.rb
#	renamed:    builder/spec/controllers/messages_controller_spec.rb -> builder/spec_old/controllers/messages_controller_spec.rb
#	renamed:    builder/spec/controllers/monitors_controller_spec.rb -> builder/spec_old/controllers/monitors_controller_spec.rb
#	renamed:    builder/spec/controllers/rules_controller_spec.rb -> builder/spec_old/controllers/rules_controller_spec.rb
#	renamed:    builder/spec/controllers/rulesets_controller_spec.rb -> builder/spec_old/controllers/rulesets_controller_spec.rb
#	renamed:    builder/spec/controllers/sites_controller_spec.rb -> builder/spec_old/controllers/sites_controller_spec.rb
#	renamed:    builder/spec/controllers/social_networks_controller_spec.rb -> builder/spec_old/controllers/social_networks_controller_spec.rb
#	renamed:    builder/spec/controllers/user/invitations_controller_spec.rb -> builder/spec_old/controllers/user/invitations_controller_spec.rb
#	renamed:    builder/spec/controllers/user/registrations_controller_spec.rb -> builder/spec_old/controllers/user/registrations_controller_spec.rb
#	renamed:    builder/spec/controllers/user/sessions_controller_spec.rb -> builder/spec_old/controllers/user/sessions_controller_spec.rb
#	renamed:    builder/spec/controllers/user_controller_spec.rb -> builder/spec_old/controllers/user_controller_spec.rb
#	renamed:    builder/spec/controllers/widgets_controller_spec.rb -> builder/spec_old/controllers/widgets_controller_spec.rb
#	renamed:    builder/spec/factories -> builder/spec_old/factories
#	renamed:    builder/spec/helpers/streams_helper_spec.rb -> builder/spec_old/helpers/streams_helper_spec.rb
#	renamed:    builder/spec/mailers/user/mailer_spec.rb -> builder/spec_old/mailers/user/mailer_spec.rb
#	new file:   builder/spec_old/models/account_spec.rb
#	renamed:    builder/spec/models/actor_daily_statistic_spec.rb -> builder/spec_old/models/actor_daily_statistic_spec.rb
#	renamed:    builder/spec/models/admin_spec.rb -> builder/spec_old/models/admin_spec.rb
#	renamed:    builder/spec/models/archived_social_activity_spec.rb -> builder/spec_old/models/archived_social_activity_spec.rb
#	renamed:    builder/spec/models/asset_data_spec.rb -> builder/spec_old/models/asset_data_spec.rb
#	renamed:    builder/spec/models/asset_markup_spec.rb -> builder/spec_old/models/asset_markup_spec.rb
#	renamed:    builder/spec/models/asset_meta_spec.rb -> builder/spec_old/models/asset_meta_spec.rb
#	renamed:    builder/spec/models/asset_spec.rb -> builder/spec_old/models/asset_spec.rb
#	renamed:    builder/spec/models/calculated_social_score_spec.rb -> builder/spec_old/models/calculated_social_score_spec.rb
#	renamed:    builder/spec/models/daily_statistic_spec.rb -> builder/spec_old/models/daily_statistic_spec.rb
#	renamed:    builder/spec/models/document_spec.rb -> builder/spec_old/models/document_spec.rb
#	renamed:    builder/spec/models/document_version_spec.rb -> builder/spec_old/models/document_version_spec.rb
#	renamed:    builder/spec/models/gnip_interface_spec.rb -> builder/spec_old/models/gnip_interface_spec.rb
#	renamed:    builder/spec/models/harvester_job_spec.rb -> builder/spec_old/models/harvester_job_spec.rb
#	new file:   builder/spec_old/models/invite_request_spec.rb
#	renamed:    builder/spec/models/link_spec.rb -> builder/spec_old/models/link_spec.rb
#	renamed:    builder/spec/models/member_spec.rb -> builder/spec_old/models/member_spec.rb
#	renamed:    builder/spec/models/message_spec.rb -> builder/spec_old/models/message_spec.rb
#	renamed:    builder/spec/models/poll_rule_spec.rb -> builder/spec_old/models/poll_rule_spec.rb
#	renamed:    builder/spec/models/published_daily_statistic_spec.rb -> builder/spec_old/models/published_daily_statistic_spec.rb
#	renamed:    builder/spec/models/rule_keyword_matching_spec.rb -> builder/spec_old/models/rule_keyword_matching_spec.rb
#	renamed:    builder/spec/models/rule_keyword_parsing_spec.rb -> builder/spec_old/models/rule_keyword_parsing_spec.rb
#	renamed:    builder/spec/models/rule_spec.rb -> builder/spec_old/models/rule_spec.rb
#	renamed:    builder/spec/models/ruleset_spec.rb -> builder/spec_old/models/ruleset_spec.rb
#	renamed:    builder/spec/models/scoring_system_spec.rb -> builder/spec_old/models/scoring_system_spec.rb
#	renamed:    builder/spec/models/site_daily_statistic_spec.rb -> builder/spec_old/models/site_daily_statistic_spec.rb
#	renamed:    builder/spec/models/site_page_view_spec.rb -> builder/spec_old/models/site_page_view_spec.rb
#	renamed:    builder/spec/models/site_spec.rb -> builder/spec_old/models/site_spec.rb
#	renamed:    builder/spec/models/social_activity/rule_spec.rb -> builder/spec_old/models/social_activity/rule_spec.rb
#	renamed:    builder/spec/models/social_activity_spec.rb -> builder/spec_old/models/social_activity_spec.rb
#	renamed:    builder/spec/models/social_network/client/facebook_spec.rb -> builder/spec_old/models/social_network/client/facebook_spec.rb
#	renamed:    builder/spec/models/social_network/client/flickr_spec.rb -> builder/spec_old/models/social_network/client/flickr_spec.rb
#	renamed:    builder/spec/models/social_network/client/twitter_spec.rb -> builder/spec_old/models/social_network/client/twitter_spec.rb
#	renamed:    builder/spec/models/social_network/client/youtube_spec.rb -> builder/spec_old/models/social_network/client/youtube_spec.rb
#	renamed:    builder/spec/models/social_network_spec.rb -> builder/spec_old/models/social_network_spec.rb
#	renamed:    builder/spec/models/social_object_spec.rb -> builder/spec_old/models/social_object_spec.rb
#	renamed:    builder/spec/models/social_score_spec.rb -> builder/spec_old/models/social_score_spec.rb
#	renamed:    builder/spec/models/theme_spec.rb -> builder/spec_old/models/theme_spec.rb
#	renamed:    builder/spec/models/timed_counter_spec.rb -> builder/spec_old/models/timed_counter_spec.rb
#	renamed:    builder/spec/models/user_spec.rb -> builder/spec_old/models/user_spec.rb
#	renamed:    builder/spec/models/widget_spec.rb -> builder/spec_old/models/widget_spec.rb
#	renamed:    builder/spec/routing/admin/system_messages_routing_spec.rb -> builder/spec_old/routing/admin/system_messages_routing_spec.rb
#	renamed:    builder/spec/routing/messages_routing_spec.rb -> builder/spec_old/routing/messages_routing_spec.rb
#	renamed:    builder/spec/spec_helper.rb -> builder/spec_old/spec_helper.rb
#	renamed:    builder/spec/support -> builder/spec_old/support
#	renamed:    builder/spec/views/admin/dashboard/index.html.erb_spec.rb -> builder/spec_old/views/admin/dashboard/index.html.erb_spec.rb
#	renamed:    builder/spec/views/admin/harvester_jobs/index.html.erb_spec.rb -> builder/spec_old/views/admin/harvester_jobs/index.html.erb_spec.rb
#	renamed:    builder/spec/views/admin/harvester_jobs/search.html.erb_spec.rb -> builder/spec_old/views/admin/harvester_jobs/search.html.erb_spec.rb
#	renamed:    builder/spec/views/admin/harvester_jobs/stats.html.erb_spec.rb -> builder/spec_old/views/admin/harvester_jobs/stats.html.erb_spec.rb
#	renamed:    builder/spec/views/admin/logger/index.html.erb_spec.rb -> builder/spec_old/views/admin/logger/index.html.erb_spec.rb
#	renamed:    builder/spec/views/admin/logger/search.html.erb_spec.rb -> builder/spec_old/views/admin/logger/search.html.erb_spec.rb
#	renamed:    builder/spec/views/admin/logger/stats.html.erb_spec.rb -> builder/spec_old/views/admin/logger/stats.html.erb_spec.rb
#	renamed:    builder/spec/views/admin/system_message/index.html.erb_spec.rb -> builder/spec_old/views/admin/system_message/index.html.erb_spec.rb
#	new file:   builder/spec_old/views/user/invitations/edit.html.erb_spec.rb
#	modified:   frontend/app/controllers/application_controller.rb
#	modified:   frontend/app/controllers/home_controller.rb
#	modified:   frontend/app/controllers/invite_request_controller.rb
#	modified:   frontend/app/models
#	modified:   frontend/app/views/home/index.html.erb
#	modified:   frontend/config/environments/development.rb
#	new file:   frontend/config/initializers/validators.rb
#	modified:   frontend/config/routes.rb
#	modified:   frontend/features/invite_request.feature
#	modified:   frontend/features/step_definitions/invite_request_steps.rb
#	modified:   frontend/spec/mailers/invite_request_mailer_spec.rb
#	modified:   frontend/spec/support/factory.rb
#	modified:   harvester/app/models
#	new file:   harvester/config/initializers/validators.rb
#	modified:   imacros/macros/Request_an_Invite.iim
#	deleted:    models/.gitignore
#	deleted:    models/.gitmodules
#	deleted:    models/.rvmrc
#	deleted:    models/account.rb
#	deleted:    models/account/permission.rb
#	deleted:    models/actor_daily_statistic.rb
#	deleted:    models/admin.rb
#	deleted:    models/analytics_computation.rb
#	deleted:    models/announcement.rb
#	deleted:    models/archived_social_activity.rb
#	deleted:    models/asset.rb
#	deleted:    models/asset_attachment.rb
#	deleted:    models/asset_data.rb
#	deleted:    models/asset_markup.rb
#	deleted:    models/asset_meta.rb
#	deleted:    models/asset_task.rb
#	deleted:    models/background_uploader.rb
#	deleted:    models/calculated_social_score.rb
#	deleted:    models/daily_statistic.rb
#	deleted:    models/document.rb
#	deleted:    models/document_version.rb
#	deleted:    models/email_subscriber.rb
#	deleted:    models/gnip_rule.rb
#	deleted:    models/guest.rb
#	deleted:    models/harvester_job.rb
#	deleted:    models/infinite_commas.rb
#	deleted:    models/infinitely_analyzer.rb
#	deleted:    models/member.rb
#	deleted:    models/member/social_network.rb
#	deleted:    models/message.rb
#	deleted:    models/notification.rb
#	deleted:    models/poll_rule.rb
#	deleted:    models/published_daily_statistic.rb
#	deleted:    models/replies.rb
#	deleted:    models/rule.rb
#	deleted:    models/rule/geolocation.rb
#	deleted:    models/rule/gnip_interface.rb
#	deleted:    models/rule/keyword_matching.rb
#	deleted:    models/rule/keyword_parsing.rb
#	deleted:    models/rule/rule_redis_interface.rb
#	deleted:    models/rule/rule_types.rb
#	deleted:    models/rule/superfeedr_interface.rb
#	deleted:    models/ruleset.rb
#	deleted:    models/score.rb
#	deleted:    models/scoring_system.rb
#	deleted:    models/scoring_system_item.rb
#	deleted:    models/sentiment_keyword.rb
#	deleted:    models/similarity.rb
#	deleted:    models/site.rb
#	deleted:    models/site/follows.rb
#	deleted:    models/site/helpers.rb
#	deleted:    models/site/location.rb
#	deleted:    models/site/plans.rb
#	deleted:    models/site/redis_cache.rb
#	deleted:    models/site/statistics.rb
#	deleted:    models/site_daily_statistic.rb
#	deleted:    models/site_page_view.rb
#	deleted:    models/social_activity.rb
#	deleted:    models/social_activity/archiving.rb
#	deleted:    models/social_activity/author.rb
#	deleted:    models/social_activity/base.rb
#	deleted:    models/social_activity/counter_cache.rb
#	deleted:    models/social_activity/eventable.rb
#	deleted:    models/social_activity/rule.rb
#	deleted:    models/social_activity/rules.rb
#	deleted:    models/social_activity/social_object.rb
#	deleted:    models/social_activity/social_object/contact_detail.rb
#	deleted:    models/social_activity/social_object/link.rb
#	deleted:    models/social_activity/statistic.rb
#	deleted:    models/social_activity/tags.rb
#	deleted:    models/social_activity/target.rb
#	deleted:    models/social_activity/tree.rb
#	deleted:    models/social_monitor.rb
#	deleted:    models/social_network.rb
#	deleted:    models/social_network/actor_rule.rb
#	deleted:    models/social_network/attribute_mapper.rb
#	deleted:    models/social_network/attribute_mapper/facebook/member.rb
#	deleted:    models/social_network/attribute_mapper/facebook/message.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/checkin.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/comment.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/event.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/link.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/music.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/note.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/photo.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/status.rb
#	deleted:    models/social_network/attribute_mapper/facebook/social_activity/video.rb
#	deleted:    models/social_network/attribute_mapper/flickr/social_activity.rb
#	deleted:    models/social_network/attribute_mapper/twitter/member.rb
#	deleted:    models/social_network/attribute_mapper/twitter/message.rb
#	deleted:    models/social_network/attribute_mapper/twitter/social_activity.rb
#	deleted:    models/social_network/attribute_mapper/youtube/social_activity.rb
#	deleted:    models/social_network/base.rb
#	deleted:    models/social_network/client.rb
#	deleted:    models/social_network/client/base.rb
#	deleted:    models/social_network/client/errors.rb
#	deleted:    models/social_network/client/facebook.rb
#	deleted:    models/social_network/client/facebook/friends.rb
#	deleted:    models/social_network/client/facebook/likes.rb
#	deleted:    models/social_network/client/facebook/messages.rb
#	deleted:    models/social_network/client/facebook/publishing.rb
#	deleted:    models/social_network/client/facebook/timelines.rb
#	deleted:    models/social_network/client/flickr.rb
#	deleted:    models/social_network/client/flickr/contacts.rb
#	deleted:    models/social_network/client/flickr/favorites.rb
#	deleted:    models/social_network/client/flickr/publishing.rb
#	deleted:    models/social_network/client/flickr/timelines.rb
#	deleted:    models/social_network/client/foursquare.rb
#	deleted:    models/social_network/client/gowalla.rb
#	deleted:    models/social_network/client/twitter.rb
#	deleted:    models/social_network/client/twitter/favorites.rb
#	deleted:    models/social_network/client/twitter/friends.rb
#	deleted:    models/social_network/client/twitter/messages.rb
#	deleted:    models/social_network/client/twitter/publishing.rb
#	deleted:    models/social_network/client/twitter/timelines.rb
#	deleted:    models/social_network/client/youtube.rb
#	deleted:    models/social_network/client/youtube/favorites.rb
#	deleted:    models/social_network/client/youtube/subscriptions.rb
#	deleted:    models/social_network/client/youtube/timelines.rb
#	deleted:    models/social_network/client/youtube/videos.rb
#	deleted:    models/social_network/helpers.rb
#	deleted:    models/social_network/services.rb
#	deleted:    models/social_network/stats.rb
#	deleted:    models/social_network/stats/base.rb
#	deleted:    models/social_network/stats/facebook.rb
#	deleted:    models/social_network/stats/flickr.rb
#	deleted:    models/social_network/stats/helpers.rb
#	deleted:    models/social_network/stats/twitter.rb
#	deleted:    models/social_network/stats/youtube.rb
#	deleted:    models/social_network/timeline_rule.rb
#	deleted:    models/social_network_feed.rb
#	deleted:    models/social_score.rb
#	deleted:    models/stream_event.rb
#	deleted:    models/system_message.rb
#	deleted:    models/theme.rb
#	deleted:    models/timed_counter.rb
#	deleted:    models/user.rb
#	deleted:    models/user_preference.rb
#	deleted:    models/validators.rb
#	deleted:    models/widget.rb
#	deleted:    models/widget_configuration.rb
#	deleted:    models/widget_ruleset.rb
#	modified:   shared/.bundle/config
#	modified:   shared/Gemfile
#	modified:   shared/Gemfile.lock
#	new file:   shared/config/initializers/validators.rb
#	modified:   shared/config/locales/devise/en.yml
#	modified:   shared/config/locales/models/en.yml
#	modified:   shared/config/settings/development.yml
#	deleted:    shared/config/settings/evan.yml
#	modified:   shared/config/settings/production.yml
#	modified:   shared/config/settings/staging.yml
#	modified:   shared/config/settings/test.yml
#	modified:   shared/config/web_services/google.yml
#	modified:   shared/config/web_services/youtube.yml
#	deleted:    shared/db/migrate/20110426030615_expire_youtube_credentials.rb
#	deleted:    shared/db/migrate/20110510072133_cleanup_duplicate_archived_sa.rb
#	deleted:    shared/db/migrate/20110524050519_cleanup_archived_social_activities.rb
#	deleted:    shared/db/migrate/20110526081605_cleanup_multiple_member_credentials.rb
#	deleted:    shared/db/migrate/20110615110012_fix_missing_social_activity_id.rb
#	deleted:    shared/db/migrate/20110624063714_cleanup_facebook_sas.rb
#	deleted:    shared/db/migrate/20110629072738_update_archived_sa_child_social_activities.rb
#	deleted:    shared/db/migrate/20110704050012_reinitialize_updated_at.rb
#	deleted:    shared/db/migrate/20110715070427_rename_sn_identifier.rb
#	deleted:    shared/db/migrate/20110717101552_convert_existing_sa_tags_into_objects.rb
#	deleted:    shared/db/migrate/20110810110900_add_fan_page_boolean_to_assets.rb
#	deleted:    shared/db/migrate/20110811063451_populate_stream_events.rb
#	deleted:    shared/db/seeds.rb
#	deleted:    shared/lib/tasks/tunnel.rake
#	modified:   shared/spec/factories/all.rb
#	modified:   shared/spec/support/carrierwave.rb
#	modified:   shared/spec/support/devise.rb
#	modified:   shared/spec/support/mongoid.rb
#	modified:   shared/spec/support/vcr.rb
#	modified:   shared/spec/support/webmock.rb
#	modified:   workers/app/models
#	new file:   workers/app/observers
#	new file:   workers/config/initializers/validators.rb
#	deleted:    workers/db
#	modified:   workers/lib/harvesters/rule_matcher.rb
#	modified:   workers/lib/harvesters/superfeedr/superfeedr_client.rb
#	modified:   workers/lib/harvesters/superfeedr_subscriptions.rb
#	new file:   workers/lib/reapers/cleanup_rule.rb
#	deleted:    workers/lib/reapers/cleanup_rule_social_activities.rb
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      builder/app/helpers/application_helper.rb
#	added by them:      builder/app/models/.gitignore
#	added by them:      builder/app/models/.gitmodules
#	added by them:      builder/app/models/.rvmrc
#	added by them:      builder/app/models/account.rb
#	added by them:      builder/app/models/account/permission.rb
#	added by them:      builder/app/models/actor_daily_statistic.rb
#	added by them:      builder/app/models/analytics_computation.rb
#	added by them:      builder/app/models/announcement.rb
#	added by them:      builder/app/models/archived_social_activity.rb
#	added by them:      builder/app/models/asset.rb
#	added by them:      builder/app/models/asset_attachment.rb
#	added by them:      builder/app/models/asset_data.rb
#	added by them:      builder/app/models/asset_markup.rb
#	added by them:      builder/app/models/asset_meta.rb
#	added by them:      builder/app/models/asset_task.rb
#	added by them:      builder/app/models/background_uploader.rb
#	added by them:      builder/app/models/calculated_social_score.rb
#	added by them:      builder/app/models/daily_statistic.rb
#	added by them:      builder/app/models/document.rb
#	added by them:      builder/app/models/document_version.rb
#	added by them:      builder/app/models/guest.rb
#	added by them:      builder/app/models/harvester_job.rb
#	added by them:      builder/app/models/infinite_commas.rb
#	added by them:      builder/app/models/infinitely_analyzer.rb
#	added by them:      builder/app/models/invite_request.rb
#	added by them:      builder/app/models/member.rb
#	added by them:      builder/app/models/member/social_network.rb
#	added by them:      builder/app/models/message.rb
#	added by them:      builder/app/models/notification.rb
#	added by them:      builder/app/models/poll_rule.rb
#	added by them:      builder/app/models/published_daily_statistic.rb
#	added by them:      builder/app/models/replies.rb
#	added by them:      builder/app/models/ruleset.rb
#	added by them:      builder/app/models/score.rb
#	added by them:      builder/app/models/scoring_system.rb
#	added by them:      builder/app/models/scoring_system_item.rb
#	added by them:      builder/app/models/sentiment_keyword.rb
#	added by them:      builder/app/models/similarity.rb
#	added by them:      builder/app/models/site.rb
#	added by them:      builder/app/models/site/follows.rb
#	added by them:      builder/app/models/site/helpers.rb
#	added by them:      builder/app/models/site/plans.rb
#	added by them:      builder/app/models/site/statistics.rb
#	added by them:      builder/app/models/site_daily_statistic.rb
#	added by them:      builder/app/models/site_page_view.rb
#	added by them:      builder/app/models/social_activity.rb
#	added by them:      builder/app/models/social_activity/archiving.rb
#	added by them:      builder/app/models/social_activity/author.rb
#	added by them:      builder/app/models/social_activity/base.rb
#	added by them:      builder/app/models/social_activity/rule.rb
#	added by them:      builder/app/models/social_activity/rules.rb
#	added by them:      builder/app/models/social_activity/social_object.rb
#	added by them:      builder/app/models/social_activity/social_object/contact_detail.rb
#	added by them:      builder/app/models/social_activity/social_object/link.rb
#	added by them:      builder/app/models/social_activity/statistic.rb
#	added by them:      builder/app/models/social_activity/target.rb
#	added by them:      builder/app/models/social_activity/tree.rb
#	added by them:      builder/app/models/social_monitor.rb
#	added by them:      builder/app/models/social_network.rb
#	added by them:      builder/app/models/social_network/attribute_mapper.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/member.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/message.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/checkin.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/comment.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/event.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/link.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/music.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/note.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/photo.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/status.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/facebook/social_activity/video.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/flickr/social_activity.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/twitter/member.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/twitter/message.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/twitter/social_activity.rb
#	added by them:      builder/app/models/social_network/attribute_mapper/youtube/social_activity.rb
#	added by them:      builder/app/models/social_network/base.rb
#	added by them:      builder/app/models/social_network/client/base.rb
#	added by them:      builder/app/models/social_network/client/errors.rb
#	added by them:      builder/app/models/social_network/client/facebook.rb
#	added by them:      builder/app/models/social_network/client/facebook/friends.rb
#	added by them:      builder/app/models/social_network/client/facebook/likes.rb
#	added by them:      builder/app/models/social_network/client/facebook/messages.rb
#	added by them:      builder/app/models/social_network/client/facebook/publishing.rb
#	added by them:      builder/app/models/social_network/client/facebook/timelines.rb
#	added by them:      builder/app/models/social_network/client/flickr.rb
#	added by them:      builder/app/models/social_network/client/flickr/contacts.rb
#	added by them:      builder/app/models/social_network/client/flickr/favorites.rb
#	added by them:      builder/app/models/social_network/client/flickr/publishing.rb
#	added by them:      builder/app/models/social_network/client/flickr/timelines.rb
#	added by them:      builder/app/models/social_network/client/foursquare.rb
#	added by them:      builder/app/models/social_network/client/gowalla.rb
#	added by them:      builder/app/models/social_network/client/twitter.rb
#	added by them:      builder/app/models/social_network/client/twitter/favorites.rb
#	added by them:      builder/app/models/social_network/client/twitter/friends.rb
#	added by them:      builder/app/models/social_network/client/twitter/messages.rb
#	added by them:      builder/app/models/social_network/client/twitter/publishing.rb
#	added by them:      builder/app/models/social_network/client/twitter/timelines.rb
#	added by them:      builder/app/models/social_network/client/youtube.rb
#	added by them:      builder/app/models/social_network/client/youtube/favorites.rb
#	added by them:      builder/app/models/social_network/client/youtube/subscriptions.rb
#	added by them:      builder/app/models/social_network/client/youtube/timelines.rb
#	added by them:      builder/app/models/social_network/client/youtube/videos.rb
#	added by them:      builder/app/models/social_network/helpers.rb
#	added by them:      builder/app/models/social_network/services.rb
#	added by them:      builder/app/models/social_network/stats.rb
#	added by them:      builder/app/models/social_network/stats/base.rb
#	added by them:      builder/app/models/social_network/stats/facebook.rb
#	added by them:      builder/app/models/social_network/stats/flickr.rb
#	added by them:      builder/app/models/social_network/stats/helpers.rb
#	added by them:      builder/app/models/social_network/stats/twitter.rb
#	added by them:      builder/app/models/social_network/stats/youtube.rb
#	added by them:      builder/app/models/social_network_feed.rb
#	added by them:      builder/app/models/social_score.rb
#	added by them:      builder/app/models/system_message.rb
#	added by them:      builder/app/models/theme.rb
#	added by them:      builder/app/models/timed_counter.rb
#	added by them:      builder/app/models/user.rb
#	added by them:      builder/app/models/user_preference.rb
#	added by them:      builder/app/models/widget.rb
#	added by them:      builder/app/models/widget_configuration.rb
#	added by them:      builder/app/models/widget_ruleset.rb
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   assets/sass/build/_buzz.scss
#	modified:   assets/stylesheets/build.css