nginx url rewrite for phalcon
Merge pull request #1 from ghettovoice/current

Current
clean config
clean config
try_files fix for phalcon
config fix and clean
Merge branch 'current'

Conflicts:
	puphpet/config.yaml
vagrant update; update puppet conf
fix missing files
Merge branch 'current'

Conflicts:
	puphpet/config.yaml
readme: included tools
config fix
Merge branch 'master' into curr

Conflicts:
	puphpet/config.yaml
config fix