options username & password added
remove ohai
Snapshot password added
-N fix
Merge remote-tracking branch 'ta/master'

Conflicts:
	knife-profitbricks-0.3.0.gem