More error handling, changed es loading to use get instead of search
Merge remote-tracking branch 'upstream/master'
spacing
Brought code back into line with existing jshint
fixed 0 height bars
Merge pull request #404 from rashidkpc/master

Fixing grunt build and 0 height bars