Merge pull request #6 from AppScale/master

Merge from main
Merge branch 'testing' of github.com:AppScale/appscale
Merge branch 'master' of github.com:nlake44/appscale
Merge branch 'testing' of github.com:AppScale/appscale
passing along spot instance params to iaas manager
Merge remote-tracking branch 'org/testing' into spot-instance-support
passing along spot instance info from the tools to the iaas manager, enabling spot instances to be spawned
forgot that spot was a str and not a bool
added spot instance tests
Merge remote-tracking branch 'org/testing' into spot-instance-support
connect to xmpp for channel in same way that we do without it
fixed taskqueue test to find taskqueue lib more intelligently
updated rakefile to also run xmpp tests
added skeleton xmpp test
Set the number of datastore servers to the number of processors
Have a default if cpuinfo doesnt work right
Merge pull request #376 from nlake44/num_db_servers

Set the number of datastore servers to the number of processors
added unit tests for xmpp
removed TODOs
Merge pull request #377 from shatterednirvana/channel-api-fix

Channel API fix