refs #3 #19

removed cancan
added slim
Merge branch 'master' into authority
added events to db/seeds.rb
change show.html.erb to show.slim for welcomes
Merge branch 'slim' of privategithub:itedd/itedd into slim
welcomes show.html.erb removed
improved welcomes#show.slim
set default local
Merge branch 'slim' of github.com:itedd/itedd into slim
updated rails
updated to rails 4.0.2
added ri_cal gem
integrated slim, prototyped welcomes#show
refs #3 #19

Added authority gem
Merge branch 'master' into authority
added basic ical support
merged master
Update Gemfile

* bugged merge