Added .travis.yml for travis-ci integration
Added missing doc-strings
Clean-up options help strings
Fixed skipped test exception
Added unit test for skipped test exception
timer-ok, timer-warning time units
Add a note about time units to the README
add myself to contributors
fix spelling
Merge pull request #25 from e0ne/travis-ci

Travis-ci integration
Update README.rst
Merge pull request #29 from skudriashev/fix-skip-test-error

Fixed skipped test exception
Merge pull request #28 from skudriashev/options-clean-up

Clean-up options help strings
Merge pull request #26 from skudriashev/doc-strings-clean-up

Added missing doc-strings
Merge remote-tracking branch 'upstream/master' into measurement

Conflicts:
	README.rst
	nosetimer/plugin.py
	setup.py
	tests/test_plugin.py
Merge pull request #30 from satyrius/measurement

Time unit for `timer-ok` and `timer-warning`