Use Rbenv and Puma insteand of RVM and Passenger
Bundle update
Use same views html and pdf formats for ArmyList export
Add export option to display/hide magic items/standards
Merge remote-tracking branch 'origin/master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/_ga.html.erb
	config/application.rb