tree a52a0cc4c54c18a54df106bc76ba76e42714de1c
parent 700eefa74bedc332a554d8715896231ee6ed6bd9
author Kiril Zvezdarov <kzvezdarov@monetate.com> 1424148128 -0500
committer spf13 <steve.francia@gmail.com> 1426213999 -0400

Marshal now gets the map via the AllSettings method

Conflicts:
	viper.go