Adding rubocop, updating to RSpec 3
Updating RSpec 3 syntax
Merge branch 'master' of github.com:code-lever/icharger-log

Conflicts:
	icharger-log.gemspec