Merge branch '2.0' into 2.1

Author: weaverryan

book/http_fundamentals.rst

@@ -357,9 +357,9 @@ Almost all modern web apps do this - including apps like WordPress.
 Stay Organized
 ~~~~~~~~~~~~~~
 
-But inside your front controller, how do you know which page should
-be rendered and how can you render each in a sane way? One way or another, you'll need to
-check the incoming URI and execute different parts of your code depending
+Inside your front controller, you have to figure out which code should be
+executed and what the content to return should be. To figure this out, you'll 
+need to check the incoming URI and execute different parts of your code depending
 on that value. This can get ugly quickly::
 
     // index.php

contributing/code/standards.rst

@@ -108,6 +108,8 @@ Naming Conventions
 
 * Use namespaces for all classes;
 
+* Abstract classes are often prefixed with `Abstract`;
+
 * Suffix interfaces with `Interface`;
 
 * Use alphanumeric characters and underscores for file names;