AUI-1417

Hey @bryceosterhaus,

Attached is an update for http://issues.liferay.com/browse/AUI-1417.  Can you review these changes to make sure the demo's still work and everything is good?

Feel free to make any additional changes source formatting wise as you see fit.

Please let me know if you have any questions.  Thanks!