Merge pull request #1 from helifino/master

/roll command changes. Thanks @helifino
Styling fixes for b6d47e6675430e73745d87ab69e780c203e0c2d3
Major refactor
Merge branch 'master' of github.com:BlueHerons/GroupMe

Conflicts:
	party_bus_callback.php
Merge pull request #1 from BlueHerons/master

Updates from upstream