enhancements & bug fixes
Merge branch 'master' of github.com:tylerbeck/lola

Conflicts:
	framework/bin/lola.min.js