Merge branch 'features/redis'

Conflicts:
	php/map.jinja
	php/ng/map.jinja

php/map.jinja

         'mysqlnd_pkg': 'php5-mysqlnd',
         'pear_pkg': 'php-pear',
         'soap_pkg': 'php-soap',
+        'redis_pkg': 'php5-redis',
         'fpm_service': 'php5-fpm',
         'xml_pkg': 'php5-xml',
         'imagick_pkg': 'php5-imagick',
         'mysqlnd_pkg': 'php-mysqlnd',
         'pear_pkg': 'php-pear',
         'soap_pkg': 'php-soap',
+        'redis_pkg': 'php-redis',
         'fpm_service': 'php-fpm',
         'xml_pkg': 'php-xml',
         'imagick_pkg': 'php-pecl-imagick',

php/ng/map.jinja

                 'pear': 'php-pear',
                 'soap': 'php-soap',
                 'xml': 'php5-xmlrpc',
+                'redis': 'php5-redis',
                 'imagick': 'php5-imagick',
                 'suhosin': 'php5-suhosin',
                 'imap': 'php5-imap',
                 'pear': 'php-pear',
                 'soap': 'php-soap',
                 'xml': 'php-xml',
+                'redis': 'php-redis',
                 'imagick': 'php-imagick',
                 'suhosin': 'php-suhosin',
                 'imap': 'php-imap',

php/ng/redis.sls

+{% set state = 'redis' %}
+{% include "php/ng/installed.jinja" %}

php/redis.sls

+{% from "php/map.jinja" import php with context %}
+
+php-redis:
+  pkg.installed:
+    - name : {{ php.redis_pkg }}