Update cancan dependency to new community gem
Bump version
Final merge of development. Moving to new branching methodology

Also, 1.1.5