wip
remove double capistrano
move sqlite to development
upgrade to rails 4.0.3
Merge branch 'master' of github.com:jameswritescode/blog

Conflicts:
	Gemfile
Merge branch 'master' into analytics