* vagrant configuration to work with Amazon AWS
* install and customize login accounts for chaos,james on vagrant nodes
* have vagrant install puppet locally rather than try to load it
  via the filesystem
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into tkt-133
* require the player to specify the desired attack type
* add second SSH key for james
Merge pull request #155 from cgolubi1/tkt-133

vagrant configuration for AWS alpha site
Merge pull request #156 from cgolubi1/102-attacktype

require the player to specify the desired attack type
* prefix unimplemented buttons with -- to work with browsers that
  don't respect CSS in dropdowns.  also make the grey a little lighter
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into tkt-125