Adding tests for git-ftp-include with git-ftp-ignore.

Previous tests used gitignore instead of git-ftp-ignore.
Merge branch 'develop' of git-ftp into tests-for-include

Conflicts:
	tests/git-ftp-test.sh
Replacing readlink with cd and pwd

davidbenton reported that `readlink -f` is not available under OSX.
Merge pull request #106 from mkllnk/patch-2

Replacing readlink with cd and pwd
Merge pull request #105 from mkllnk/tests-for-include

Tests for include with git-ftp-ignore
Merge branch 'develop' of git-ftp into develop
Fix sha1 upload after push.

A bug, introduced by abort on remote file changes, resulted in never
uploading the current sha1 in the push action. This is covered by a unit
test now.