Grotesque oversight, Actually fixes issue #20
Grotesque oversight, Actually fixes issue #20
Merge branch 'beta' of https://github.com/copleykj/Mesosphere into beta

Conflicts:
	js/mesosphere.js
Merge branch 'beta' into issue13