Removing commented out items

This was getting parsed and causing problems
forcing versions
updating example
adding nova with a ssh key
Merge branch 'feature/nova-db-replication' into upstream
Merge branch 'release/nova-ssh'

Conflicts:
	init.sls