upped the timeout limits
merge from upstream
added attack aliases
Merge pull request #58 from wickett/master

Changed the attack_step name to attack_alias and added the format feature