fix for issue 30
Merge branch 'develop' of github.com:mikeedwards83/Glass.Mapper into develop

Conflicts:
	.gitignore