Added macro to handle defining persona and action type enums.
Removed some unneeded #includes.
Removed commented block.
Merge branch 'next' into vault

Conflicts:
	include/maidsafe/nfs/types.h