Added a little comment
merge
cleaned up grunt file and demo build process