test fix
pulling master
reenabling travis local and unit tests
trigerring travis
trigerring travis
added swipe param to flick