Merge branch 'dev' of github.com:mozilla/browserid into dev

ChangeLog

@@ -10,7 +10,8 @@ train-2011.08.18:
   * all files created at execution time are now in one location:  #172	
   * developer ergonomics - improved colorized logging with terse webserver output to console
   * always require a user to authenticate if they don't have an active session: #74
-	
+  * improved CSRF protection to fix race conditions in previous train: #173
+		
 train-2011.08.12:
   * massive zero-user-visibile refactoring of dialog javascript.
   * fix cancel button in "waiting for verification state" (issue #147)