Merge pull request #36 from amcgowanca/7.x-1.x

Environments and modes
Removed hook_permission(), fixed spacing in .info