Squashed commit of the following:

commit a2285580232df8131fc2141cda721add482ae538
Author: Brian Kim <briankimpossible@gmail.com>
Date:   Sun Mar 3 14:01:43 2013 -0500

    Undo Gemfile change

commit bb23182c5966a3ed92fe9df1fb3a122db6b2615c
Author: Brian Kim <briankimpossible@gmail.com>
Date:   Sun Mar 3 13:52:34 2013 -0500

    Rephrase tests

commit d4a5befbc99d33c4cb1520604864acf637c16a7e
Author: Brian Kim <briankimpossible@gmail.com>
Date:   Sat Mar 2 21:05:10 2013 -0500

    Fix another godddamn bug

commit 016aa0ace897399e5b4a3cb378459358198e722f
Author: Brian Kim <briankimpossible@gmail.com>
Date:   Sat Mar 2 21:02:00 2013 -0500

    Move test outside of block

commit e53ace49b3f69fd7fd7b42b1d044f6ab0a6aa268
Author: Brian Kim <briankimpossible@gmail.com>
Date:   Sat Mar 2 20:58:24 2013 -0500

    Fix minor typo

commit 6612cd8e970c61e3ff6cce67fe10b72929a0d622
Author: Brian Kim <briankimpossible@gmail.com>
Date:   Sat Mar 2 20:38:48 2013 -0500

    Fix order dependency in site_setting_spec.rb

    The spec contained an order dependency which would cause the default
    bool test to fail. You can confirm this by running the spec with the
    option "--order rand" a couple times. This dependency was caused by
    surprising behavior in SiteSetting::setting as shown below:

    SiteSetting.setting(:bool_setting?, false)
    SiteSetting.refresh!
    SiteSetting.bool_setting? #=> false
    SiteSetting.random_setting = true
    SiteSetting.bool_setting? #=> true
    SiteSetting.setting(:bool_setting?, false)
    SiteSetting.refresh!
    SiteSetting.bool_setting? #=> true!

    The spec is merely desriptive, and I have labeled what I think could be
    possible bugs.
better french traduction...

... regarding the minimum entropies
updated Gemfile.lock to take into account the rb-inotify's version bump
some more extracted strings for translation
added the gear icon to the "Admin" button on the user page
update vagrant documentation

to deal with eventual troubles while downloading the box
Don't double-up on #main-outlet when static content is rendered through Ember
Fix order dependency in site_setting_spec.rb

The spec contained an order dependency which would cause the default
bool test to fail. You can confirm this by running the spec with the
option "--order rand" a couple times. This dependency was caused by
surprising behavior in SiteSetting::setting as shown below:

SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> false
SiteSetting.bool_setting = true
SiteSetting.bool_setting? #=> true
SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> true!

The spec is merely desriptive, and I have labeled what I think could be
possible bugs.

Undo Gemfile change
Merge branch 'site_setting_spec_fix' of github.com:dracula2000/discourse into site_setting_spec_fix

Conflicts:
	spec/models/site_setting_spec.rb