Partial ubuntu implementation
Merge branch 'master' of github.com:bartv/imp-graphite

Conflicts:
	model/_init.cf