Removing Avalanche specific items, introduced in merge from avalanche.
Changing format of doxygen file comments.
Setting c indent options for namespaces, cases, and scope declarations.
Merge branch 'master' into avalanche

Conflicts:
	vimrc