Merge branch 'master' into fix-theme-path

Conflicts:
	features/theme.feature

diff --cc features/theme.feature
index 4231fc5,f09a44d..e01b40d
--- 1/features/theme.feature
--- 2/features/theme.feature
+++ b/features/theme.feature
@@@ -69,14 -69,13 +69,25 @@@ Feature: Manage WordPress theme
        | name  | status   | update    | version   |
        | p2    | active   | available | 1.4.1     |
  
 +  Scenario: Get the path of an installed theme
 +    Given a WP install
 +
 +    When I run `wp theme install twentyeleven`
 +    Then STDOUT should not be empty
 +
 +    When I run `wp theme path twentyeleven --dir`
 +    Then STDOUT should contain:
 +       """
 +       wp-content/themes/twentyeleven
 +       """
++
+   Scenario: Get details about an installed theme
+     Given a WP install
+ 
+     When I run `wp theme install p2`
+     Then STDOUT should not be empty
+ 
+     When I run `wp theme get p2`
+     Then STDOUT should be a table containing rows:
+       | Field | Value          |
+       | name  | P2             |

diff --cc php/commands/theme.php
Simple merge