More configuration options

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>

Conflicts:
	mk/Makefile
Merge pull request #81 from jonludlam/more-config-2

More configuration options