Merge branch 'vmiller-master'
Added mem_size to template
Merge branch 'gmarnin-master'
testing a different method for getting the mount point and disk ID
changed the way the mount point is determined