Merge branch 'stripped-down-gs'

app/controllers/application_controller.rb

app/controllers/profiles_controller.rb

app/controllers/status_messages_controller.rb

app/controllers/tag_followings_controller.rb

app/controllers/users_controller.rb

app/helpers/getting_started_helper.rb

app/helpers/interim_stream_hackiness_helper.rb

app/models/person.rb

app/views/aspects/_aspect_stream.haml

app/views/aspects/index.html.haml

app/views/contacts/index.html.haml

app/views/invitations/new.html.haml

app/views/layouts/application.html.haml

app/views/photos/_new_profile_photo.haml

app/views/profiles/_edit_public.haml

app/views/shared/_contact_sidebar.html.haml

app/views/shared/_publisher.html.haml

app/views/users/getting_started.haml

config/assets.yml

config/locales/diaspora/en.yml