Machine guns!

Added a machine gun weapon constructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	neintimes/weaponry/weapon.py