Merge branch 'develop'
Adding debian 7 support by copying debian 6.

Fixes #15
Bumping version for debian support
Merge branch 'master' into develop