Conflicts:
	README.md
	requirements.txt
	setup.py

It represents the latest state on github, which should be better than
what's installed by default.

[skip ci]

tox https://pypi.python.org/pypi/tox is a thin wrapper around virtualenv
which let you craft a fresh python environement to execute command in.

It creates the env with virtualenv, install dependencies, run python
setup.py install in it and then execute whatever command you want it to
do and report status.

To do so I simply:

- listed tests dependencies in test-requirements.txt (which are just
  nose and mock)
- provide a tox.ini file which describe how to install the dependencies
  and execute nosetests
- added the module 'coverage' to the list of test dependencies

To run tests simply:

 pip install tox && tox

That will execute the test command 'nosetests' using python2.6 and then
python 2.7.

The additional env 'cover' can be run using: tox -ecover.

As relative paths are used througout, it will work for everyone using
sublime text out of the box.

Fixed test which used the --force flag on move, but there is only a short version (left) it appears

vim saves temporary data in $FILENAME.swp.
emacs saves backups in $FILENAME~.

.gitignore now ignores all of these entries.

Signed-off-by: David Aguilar <davvid@gmail.com>

This commit sets up .gitignore so that it properly ignores both
.pyo and .pyc files.

The egg path was updated so that it is prepended with a "/".

"/build" was added to the list of ignored paths since it is
customary for setuptools to use that directory for builds.

Signed-off-by: David Aguilar <davvid@gmail.com>