test fix travis
still trying to fix
Always do += onto system flags such as CFLAGS and LDFLAGS
Merge pull request #29 from staticfloat/sf/makevarfix

Always do += onto system flags such as CFLAGS and LDFLAGS
bump version for new relase
Merge branch 'master' of https://github.com/cvxgrp/scs
add ability to query __version__ in python, closes #30
Merge branch 'master' into dense

Conflicts:
	.travis.yml
	python/scs.py