Merge pull request #185 from atungare/dev

Dev - devops fun
fix masonry error in gruntfile
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev