more restructuring for flexible companions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js
Merge pull request #145 from jpecht/master

epic merge / more restructuring for flexible companions