Merge pull request #4 from MirantisDellCrowbar/bug/chef-server/pebbles/master

killall -9 chef-server chef-server-webui missed child processes like
Merge pull request #5 from crowbar/master

wrooom
install-chef-suse: Remove barclamps dir after uninstalling barclamps

Since uninstalling barclamps should remove the yml files from there,
let the uninstall process work.
change test gem cache to 1.9
remove nagios and ganglia from trunk for now
Don't clear terminal in case of error (i.e. when using '-v')
Rewrite code updating navigation.rb

We re-generate navigation.rb fully now, instead of updating it live
(which can easily break if navigation.rb gets touched by someone).
Merge pull request #1857 from saschpe/master-installchefsuse-noclear

Don't clear terminal in case of error (i.e. when using '-v')
Merge pull request #1856 from vuntz/install-chef-suse-fix

install-chef-suse: Remove barclamps dir after uninstalling barclamps
Merge pull request #6 from crowbar/master

pull changes from dell
lets try to enable vnc at least. "640x480 graphic mode" is not enought to debug something
more proper way to enable vnc
Merge pull request #1859 from MirantisDellCrowbar/unstable/pebbles/master

Enable vnc for testing purposes
Merge pull request #1860 from cloudedge/master

https://github.com/crowbar/crowbar/pull/1860

Merged by devtool for VictorLowther
Merge pull request #1858 from vuntz/rebuild-navigation

https://github.com/crowbar/crowbar/pull/1858

Merged by devtool for cloudsleuth
Revert "Rewrite code updating navigation.rb"

This reverts commit a62a51c29bdd356fd9d1f71967e61325943b50e1.
Merge pull request #1862 from cloudsleuth/pull-req-master-7c7f5fbc4bfa11249663d08459068f0f7e531991

https://github.com/crowbar/crowbar/pull/1862

Merged by devtool for cloudsleuth
Merge branch 'master' of https://github.com/crowbar/crowbar
DE1227 - Move Pull from source to the bottom of each proposal instead of the top or middle etc.