[hammerhead] Add mountpoints

Change-Id: Icbe528a5849bfe35cc7b0331cea8ffc3d871f558
Merge pull request #23 from sledges/hammerhead

[hammerhead] Add mountpoints