initial astyle changes
revert spacing changes around switch statements
Merge branch 'dev' of github.com:jmmL/sprout into jmml-dev

Conflicts:
	sprout/main.cpp
Merge pull request #811 from Metaswitch/jmml-dev

[No reviewer] Merge from jmmL fork