current config
Merge branch 'master' into current

Conflicts:
	puphpet/config.yaml
Merge branch 'master' into current
nginx url rewrite for phalcon
Merge pull request #1 from ghettovoice/current

Current