Refactored architecture
Resolved conflicts
Merge branch 'master' of github.com:Juicr/Juicr

Conflicts:
	juicr.go