Fixed some stupid shit where we woudl ask for less servers than physically possible.  Also ensured we alwyas have one database....
Merge branch 'master' of https://github.com/t3kk/Hackathon-MCCS-S2013
done?