Fix php ini files paths
Remove  unused markup
Add .vagrant to gitignore
Using CURRENT_TIMESTAMP isn't valid on the software versions we're running (Fix #158)
Add a missing HTML id
Merge remote-tracking branch 'origin/framework' into g11n

Conflicts:
	templates/tracker/issue.add.twig