Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
JSHint caught this for me: the `data` property is repeated here. (Sidenote: @ianjorgensen do you want me to add a Gulp jshint watcher in tideline? I use a SublimeText plugin for JSHint myself, but if you want a watcher I can easily add it.)