Small mixup...

Pushing a fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/clouds/osk_cloud_ops.py
Indentions... Damn you python
Again... white space
Merge pull request #42 from jtaleric/master

Floaters - use existing floaters if they exist.