updates from unstable

Merge branch 'unstable' of github.com:sociam/indx into unstable-well
templates
committing move
merging magic

Merge branch 'unstable-well' of github.com:sociam/indx into unstable-well
day in the life
pete's visualisation

Merge branch 'unstable' of github.com:sociam/indx into unstable-well
aditl beginnings
getting activities
merging branch unstable

Merge branch 'unstable' of github.com:sociam/indx into unstable-well
got rid of ramines config json
committing getActivity
query for nike fitbit
starting segmentation
timeseries queries
Merge branch 'unstable-well' of github.com:sociam/indx into unstable-well
starting segmentation
timeseries queries
so many omgs
merging in unstable-well from laura

Merge branch 'unstable-well' of github.com:sociam/indx into unstable-well
updatd queries