More modularizing

Added function load_meta
Merge branch 'master' of github.com:ssteuteville/makefs

Conflicts:
	src/makefs